Skip to content

Commit c3bf33b

Browse files
smuellerDDsmuellerDD
committed
ML-DSA: apply clang-format
Signed-off-by: Stephan Mueller <smueller@chronox.de>
1 parent e2e519a commit c3bf33b

9 files changed

+332
-319
lines changed

‎ml-dsa/api/dilithium_type.h‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -290,18 +290,22 @@ extern "C" {
290290

291291
/* RISCV 64 RVV Implementation */
292292
#define lc_dilithium_keypair_riscv64_rvv DILITHIUM_F(keypair_riscv64_rvv)
293-
#define lc_dilithium_keypair_from_seed_riscv64_rvv \
293+
#define lc_dilithium_keypair_from_seed_riscv64_rvv \
294294
DILITHIUM_F(keypair_from_seed_riscv64_rvv)
295295
#define lc_dilithium_sign_riscv64_rvv DILITHIUM_F(sign_riscv64_rvv)
296296
#define lc_dilithium_sign_ctx_riscv64_rvv DILITHIUM_F(sign_ctx_riscv64_rvv)
297297
#define lc_dilithium_sign_init_riscv64_rvv DILITHIUM_F(sign_init_riscv64_rvv)
298-
#define lc_dilithium_sign_update_riscv64_rvv DILITHIUM_F(sign_update_riscv64_rvv)
298+
#define lc_dilithium_sign_update_riscv64_rvv \
299+
DILITHIUM_F(sign_update_riscv64_rvv)
299300
#define lc_dilithium_sign_final_riscv64_rvv DILITHIUM_F(sign_final_riscv64_rvv)
300301
#define lc_dilithium_verify_riscv64_rvv DILITHIUM_F(verify_riscv64_rvv)
301302
#define lc_dilithium_verify_ctx_riscv64_rvv DILITHIUM_F(verify_ctx_riscv64_rvv)
302-
#define lc_dilithium_verify_init_riscv64_rvv DILITHIUM_F(verify_init_riscv64_rvv)
303-
#define lc_dilithium_verify_update_riscv64_rvv DILITHIUM_F(verify_update_riscv64_rvv)
304-
#define lc_dilithium_verify_final_riscv64_rvv DILITHIUM_F(verify_final_riscv64_rvv)
303+
#define lc_dilithium_verify_init_riscv64_rvv \
304+
DILITHIUM_F(verify_init_riscv64_rvv)
305+
#define lc_dilithium_verify_update_riscv64_rvv \
306+
DILITHIUM_F(verify_update_riscv64_rvv)
307+
#define lc_dilithium_verify_final_riscv64_rvv \
308+
DILITHIUM_F(verify_final_riscv64_rvv)
305309
#define dilithium_ntt_8l_rvv DILITHIUM_F(ntt_8l_rvv)
306310
#define dilithium_intt_8l_rvv DILITHIUM_F(intt_8l_rvv)
307311
#define dilithium_poly_basemul_8l_rvv DILITHIUM_F(poly_basemul_8l_rvv)

‎ml-dsa/src/riscv64/dilithium_consts_rvv.c‎

Lines changed: 277 additions & 277 deletions
Large diffs are not rendered by default.

‎ml-dsa/src/riscv64/dilithium_ntt_rvv.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
extern void dilithium_ntt_8l_rvv(int32_t *r, const int32_t *qdata);
5353
extern void dilithium_intt_8l_rvv(int32_t *r, const int32_t *qdata);
5454
extern void dilithium_poly_basemul_8l_rvv(int32_t *r, const int32_t *a,
55-
const int32_t *b);
55+
const int32_t *b);
5656
extern void dilithium_poly_basemul_acc_8l_rvv(int32_t *r, const int32_t *a,
57-
const int32_t *b);
57+
const int32_t *b);
5858
extern void dilithium_ntt2normal_order_8l_rvv(int32_t *r, const int32_t *qdata);
5959
extern void dilithium_normal2ntt_order_8l_rvv(int32_t *r, const int32_t *qdata);
6060
extern void dilithium_poly_reduce_rvv(int32_t *r);

‎ml-dsa/src/riscv64/dilithium_signature_api_riscv64.c‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ LC_INTERFACE_FUNCTION(int, lc_dilithium_keypair_from_seed,
2828
const uint8_t *seed, size_t seedlen)
2929
{
3030
if (lc_cpu_feature_available() & LC_CPU_FEATURE_RISCV_ASM_RVV)
31-
return lc_dilithium_keypair_from_seed_riscv64_rvv(pk, sk, seed, seedlen);
31+
return lc_dilithium_keypair_from_seed_riscv64_rvv(pk, sk, seed,
32+
seedlen);
3233
return lc_dilithium_keypair_from_seed_riscv64(pk, sk, seed, seedlen);
3334
}
3435

@@ -56,7 +57,8 @@ LC_INTERFACE_FUNCTION(int, lc_dilithium_sign_ctx, struct lc_dilithium_sig *sig,
5657
struct lc_rng_ctx *rng_ctx)
5758
{
5859
if (lc_cpu_feature_available() & LC_CPU_FEATURE_RISCV_ASM_RVV)
59-
return lc_dilithium_sign_ctx_riscv64_rvv(sig, ctx, m, mlen, sk, rng_ctx);
60+
return lc_dilithium_sign_ctx_riscv64_rvv(sig, ctx, m, mlen, sk,
61+
rng_ctx);
6062
return lc_dilithium_sign_ctx_riscv64(sig, ctx, m, mlen, sk, rng_ctx);
6163
}
6264

@@ -84,7 +86,8 @@ LC_INTERFACE_FUNCTION(int, lc_dilithium_sign_final,
8486
struct lc_rng_ctx *rng_ctx)
8587
{
8688
if (lc_cpu_feature_available() & LC_CPU_FEATURE_RISCV_ASM_RVV)
87-
return lc_dilithium_sign_final_riscv64_rvv(sig, ctx, sk, rng_ctx);
89+
return lc_dilithium_sign_final_riscv64_rvv(sig, ctx, sk,
90+
rng_ctx);
8891
return lc_dilithium_sign_final_riscv64(sig, ctx, sk, rng_ctx);
8992
}
9093

@@ -103,7 +106,8 @@ LC_INTERFACE_FUNCTION(int, lc_dilithium_verify_ctx,
103106
size_t mlen, const struct lc_dilithium_pk *pk)
104107
{
105108
if (lc_cpu_feature_available() & LC_CPU_FEATURE_RISCV_ASM_RVV)
106-
return lc_dilithium_verify_ctx_riscv64_rvv(sig, ctx, m, mlen, pk);
109+
return lc_dilithium_verify_ctx_riscv64_rvv(sig, ctx, m, mlen,
110+
pk);
107111
return lc_dilithium_verify_ctx_riscv64(sig, ctx, m, mlen, pk);
108112
}
109113

‎ml-dsa/src/riscv64/dilithium_signature_riscv64_rvv.h‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,43 +28,45 @@ extern "C" {
2828
#endif
2929

3030
int lc_dilithium_keypair_riscv64_rvv(struct lc_dilithium_pk *pk,
31-
struct lc_dilithium_sk *sk,
32-
struct lc_rng_ctx *rng_ctx);
31+
struct lc_dilithium_sk *sk,
32+
struct lc_rng_ctx *rng_ctx);
3333
int lc_dilithium_keypair_from_seed_riscv64_rvv(struct lc_dilithium_pk *pk,
34-
struct lc_dilithium_sk *sk,
35-
const uint8_t *seed, size_t seedlen);
34+
struct lc_dilithium_sk *sk,
35+
const uint8_t *seed,
36+
size_t seedlen);
3637

37-
int lc_dilithium_sign_riscv64_rvv(struct lc_dilithium_sig *sig, const uint8_t *m,
38-
size_t mlen, const struct lc_dilithium_sk *sk,
39-
struct lc_rng_ctx *rng_ctx);
40-
int lc_dilithium_sign_ctx_riscv64_rvv(struct lc_dilithium_sig *sig,
41-
struct lc_dilithium_ctx *ctx,
38+
int lc_dilithium_sign_riscv64_rvv(struct lc_dilithium_sig *sig,
4239
const uint8_t *m, size_t mlen,
4340
const struct lc_dilithium_sk *sk,
4441
struct lc_rng_ctx *rng_ctx);
42+
int lc_dilithium_sign_ctx_riscv64_rvv(struct lc_dilithium_sig *sig,
43+
struct lc_dilithium_ctx *ctx,
44+
const uint8_t *m, size_t mlen,
45+
const struct lc_dilithium_sk *sk,
46+
struct lc_rng_ctx *rng_ctx);
4547
int lc_dilithium_sign_init_riscv64_rvv(struct lc_dilithium_ctx *ctx,
46-
const struct lc_dilithium_sk *sk);
48+
const struct lc_dilithium_sk *sk);
4749
int lc_dilithium_sign_update_riscv64_rvv(struct lc_dilithium_ctx *ctx,
48-
const uint8_t *m, size_t mlen);
50+
const uint8_t *m, size_t mlen);
4951
int lc_dilithium_sign_final_riscv64_rvv(struct lc_dilithium_sig *sig,
50-
struct lc_dilithium_ctx *ctx,
51-
const struct lc_dilithium_sk *sk,
52-
struct lc_rng_ctx *rng_ctx);
52+
struct lc_dilithium_ctx *ctx,
53+
const struct lc_dilithium_sk *sk,
54+
struct lc_rng_ctx *rng_ctx);
5355

5456
int lc_dilithium_verify_riscv64_rvv(const struct lc_dilithium_sig *sig,
55-
const uint8_t *m, size_t mlen,
56-
const struct lc_dilithium_pk *pk);
57-
int lc_dilithium_verify_ctx_riscv64_rvv(const struct lc_dilithium_sig *sig,
58-
struct lc_dilithium_ctx *ctx,
5957
const uint8_t *m, size_t mlen,
6058
const struct lc_dilithium_pk *pk);
59+
int lc_dilithium_verify_ctx_riscv64_rvv(const struct lc_dilithium_sig *sig,
60+
struct lc_dilithium_ctx *ctx,
61+
const uint8_t *m, size_t mlen,
62+
const struct lc_dilithium_pk *pk);
6163
int lc_dilithium_verify_init_riscv64_rvv(struct lc_dilithium_ctx *ctx,
62-
const struct lc_dilithium_pk *pk);
64+
const struct lc_dilithium_pk *pk);
6365
int lc_dilithium_verify_update_riscv64_rvv(struct lc_dilithium_ctx *ctx,
64-
const uint8_t *m, size_t mlen);
66+
const uint8_t *m, size_t mlen);
6567
int lc_dilithium_verify_final_riscv64_rvv(const struct lc_dilithium_sig *sig,
66-
struct lc_dilithium_ctx *ctx,
67-
const struct lc_dilithium_pk *pk);
68+
struct lc_dilithium_ctx *ctx,
69+
const struct lc_dilithium_pk *pk);
6870

6971
#ifdef __cplusplus
7072
}

‎ml-dsa/tests/dilithium_tester_iuf_riscv64.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@
2727
#include "riscv64/dilithium_signature_riscv64.h"
2828

2929
static int _dilithium_tester_iuf_riscv64(unsigned int rounds,
30-
unsigned int internal,
31-
unsigned int prehashed)
30+
unsigned int internal,
31+
unsigned int prehashed)
3232
{
3333
return _dilithium_init_update_final_tester(
3434
rounds, internal, prehashed, lc_dilithium_keypair_riscv64,
3535

36-
lc_dilithium_sign_init_riscv64, lc_dilithium_sign_update_riscv64,
36+
lc_dilithium_sign_init_riscv64,
37+
lc_dilithium_sign_update_riscv64,
3738
lc_dilithium_sign_final_riscv64,
3839

3940
lc_dilithium_verify_init_riscv64,

‎ml-dsa/tests/dilithium_tester_iuf_riscv64_rvv.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@
2727
#include "riscv64/dilithium_signature_riscv64_rvv.h"
2828

2929
static int _dilithium_tester_iuf_riscv64_rvv(unsigned int rounds,
30-
unsigned int internal,
31-
unsigned int prehashed)
30+
unsigned int internal,
31+
unsigned int prehashed)
3232
{
3333
return _dilithium_init_update_final_tester(
3434
rounds, internal, prehashed, lc_dilithium_keypair_riscv64_rvv,
3535

36-
lc_dilithium_sign_init_riscv64_rvv, lc_dilithium_sign_update_riscv64_rvv,
36+
lc_dilithium_sign_init_riscv64_rvv,
37+
lc_dilithium_sign_update_riscv64_rvv,
3738
lc_dilithium_sign_final_riscv64_rvv,
3839

3940
lc_dilithium_verify_init_riscv64_rvv,

‎ml-dsa/tests/dilithium_tester_riscv64.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "riscv64/dilithium_signature_riscv64.h"
2727

2828
static int _dilithium_tester_riscv64(unsigned int rounds, unsigned int internal,
29-
unsigned int prehashed)
29+
unsigned int prehashed)
3030
{
3131
return _dilithium_tester(rounds, 1, internal, prehashed,
3232
lc_dilithium_keypair_riscv64,

‎ml-dsa/tests/dilithium_tester_riscv64_rvv.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@
2626

2727
#include "riscv64/dilithium_signature_riscv64_rvv.h"
2828

29-
static int _dilithium_tester_riscv64_rvv(unsigned int rounds, unsigned int internal,
30-
unsigned int prehashed)
29+
static int _dilithium_tester_riscv64_rvv(unsigned int rounds,
30+
unsigned int internal,
31+
unsigned int prehashed)
3132
{
3233
return _dilithium_tester(rounds, 1, internal, prehashed,
3334
lc_dilithium_keypair_riscv64_rvv,

0 commit comments

Comments
 (0)