Mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2026-01-18 17:11:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

OSSL_FN: Add the OSSL_FN_ typedefs to .clang-format's TypeNames

Browse Source 
Furthermore, reformatting left some weird commenting in fn_api_test.c
because of (legitimate) line breaks, so they get adjust for purpose.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29412)
This commit is contained in:
Richard Levitte
2025-12-16 08:04:37 +01:00
parent 2b9bd6dcf3
commit 2f6e92db2e
2 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.clang-format
View File

@@ -16,6 +16,18 @@ PointerAlignment: Right
# of a comment block to protect comments as
# per STYLE.md
CommentPragmas: '(^ IWYU pragma:|^\*$|^-$)'
# OpenSSL uses type names (usually typedefs) extensively. Tell clang-format about them.
TypeNames:
- "BIGNUM"
- "BN_BLINDING"
- "BN_CTX"
- "BN_GENCB"
- "BN_MONT_CTX"
- "BN_RECP_CTX"
- "BN_ULLONG"
- "BN_ULONG"
- "OSSL_FN_CTX"
- "OSSL_FN_ULONG"
# OpenSSL uses macros extensively. Tell clang-format about them.
TypenameMacros: ['LHASH_OF', 'STACK_OF']
StatementMacros:

48
test/fn_api_test.c
View File

@@ -133,12 +133,12 @@ static const OSSL_FN_ULONG ex_add_num3_num3[] = {
#define ADD_CASE(i, op1, op2, ex) \
{ \
/* op1, with size */ op1, \
LIMBSOF(op1), \
/* op2, with size */ op2, \
LIMBSOF(op2), \
/* ex, with size */ ex, \
LIMBSOF(ex), \
/* op1 */ op1, \
/* op1_size */ LIMBSOF(op1), \
/* op2 */ op2, \
/* op2_size */ LIMBSOF(op2), \
/* ex */ ex, \
/* ex_size */ LIMBSOF(ex), \
/* op1_live_size */ LIMBSOF(op1), \
/* op2_live_size */ LIMBSOF(op2), \
/* res_live_size */ LIMBSOF(ex), \
@@ -530,12 +530,12 @@ end:
/* i should be set to match the iteration number that's displayed when testing */
#define MUL_CASE(i, op1, op2, ex) \
{ \
/* op1, with size */ op1, \
LIMBSOF(op1), \
/* op2, with size */ op2, \
LIMBSOF(op2), \
/* ex, with size */ ex, \
LIMBSOF(ex), \
/* op1 */ op1, \
/* op1_size */ LIMBSOF(op1), \
/* op2 */ op2, \
/* op2_size */ LIMBSOF(op2), \
/* ex */ ex, \
/* ex_size */ LIMBSOF(ex), \
/* op1_live_size */ LIMBSOF(op1) + 1, \
/* op2_live_size */ LIMBSOF(op2) + 2, \
/* res_live_size */ LIMBSOF(op1) + LIMBSOF(op2) + ((i - 1) % 4), \
@@ -574,12 +574,12 @@ static int test_mul(int i)
/* i should be set to match the iteration number that's displayed when testing */
#define MUL_TRUNCATED_CASE(i, op1, op2, ex) \
{ \
/* op1, with size */ op1, \
LIMBSOF(op1), \
/* op2, with size */ op2, \
LIMBSOF(op2), \
/* ex, with size */ ex, \
LIMBSOF(ex), \
/* op1 */ op1, \
/* op1_size */ LIMBSOF(op1), \
/* op2 */ op2, \
/* op2_size */ LIMBSOF(op2), \
/* ex */ ex, \
/* ex_size */ LIMBSOF(ex), \
/* op1_live_size */ LIMBSOF(op1) + 1, \
/* op2_live_size */ LIMBSOF(op2) + 2, \
/* res_live_size */ LIMBSOF(ex) / 2, \
@@ -588,12 +588,12 @@ static int test_mul(int i)
/* A special case, where the truncation is set to the size of ex minus 64 bits */
#define MUL_TRUNCATED_SPECIAL_CASE1(i, op1, op2, ex) \
{ \
/* op1, with size */ op1, \
LIMBSOF(op1), \
/* op2, with size */ op2, \
LIMBSOF(op2), \
/* ex, with size */ ex, \
LIMBSOF(ex), \
/* op1 */ op1, \
/* op1_size */ LIMBSOF(op1), \
/* op2 */ op2, \
/* op2_size */ LIMBSOF(op2), \
/* ex */ ex, \
/* ex_size */ LIMBSOF(ex), \
/* op1_live_size */ LIMBSOF(op1) + 1, \
/* op2_live_size */ LIMBSOF(op2) + 2, \
/* res_live_size */ LIMBSOF(ex) - 8 / OSSL_FN_BYTES, \