Skip to content

Commit de6107d

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

File tree

4 files changed

+72
-76
lines changed

4 files changed

+72
-76
lines changed

‎apps/src/lc_x509_generator.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,8 +624,8 @@ static int x509_enc_set_key(struct x509_generator_opts *opts)
624624
CKINT_LOG(get_data(opts->pk_file, &opts->pk_data,
625625
&opts->pk_len),
626626
"PK mmap failure\n");
627-
CKINT(lc_x509_pk_parse(keys, opts->in_key_type,
628-
opts->pk_data, opts->pk_len));
627+
CKINT(lc_x509_pk_parse(keys, opts->in_key_type, opts->pk_data,
628+
opts->pk_len));
629629
if (self_signed) {
630630
CKINT_LOG(get_data(opts->sk_file, &opts->sk_data,
631631
&opts->sk_len),

‎asn1/api/lc_x509_generator.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ int lc_x509_gen_keypair(struct lc_x509_certificate *cert,
173173
* @return 0 on success, < 0 on error
174174
*/
175175
int lc_x509_load_keypair(struct lc_x509_certificate *cert,
176-
struct lc_x509_key_data *keys,
177-
enum lc_sig_types keypair_algo);
176+
struct lc_x509_key_data *keys,
177+
enum lc_sig_types keypair_algo);
178178

179179
/**
180180
* @ingroup X509Gen

‎asn1/api/lc_x509_parser.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,9 +326,8 @@ int lc_x509_sk_parse(struct lc_x509_key_data *key, enum lc_sig_types key_type,
326326
*
327327
* @return 0 on success or < 0 on error
328328
*/
329-
int lc_x509_pk_parse(struct lc_x509_key_data *key,
330-
enum lc_sig_types key_type, const uint8_t *data,
331-
size_t datalen);
329+
int lc_x509_pk_parse(struct lc_x509_key_data *key, enum lc_sig_types key_type,
330+
const uint8_t *data, size_t datalen);
332331

333332
/**
334333
* @ingroup X509

‎asn1/src/asym_key.c‎

Lines changed: 66 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,7 @@ int public_key_extract(struct x509_generate_context *ctx, uint8_t *dst_data,
197197
case LC_SIG_DILITHIUM_44:
198198
case LC_SIG_DILITHIUM_65:
199199
case LC_SIG_DILITHIUM_87:
200-
CKINT(lc_dilithium_pk_ptr(&ptr, &pklen,
201-
keys->pk.dilithium_pk));
200+
CKINT(lc_dilithium_pk_ptr(&ptr, &pklen, keys->pk.dilithium_pk));
202201
break;
203202
case LC_SIG_SPINCS_SHAKE_128F:
204203
case LC_SIG_SPINCS_SHAKE_128S:
@@ -392,17 +391,17 @@ int pubkey_key_decode(struct lc_x509_key_data *keys, const uint8_t *data,
392391
case LC_SIG_DILITHIUM_44:
393392
case LC_SIG_DILITHIUM_65:
394393
case LC_SIG_DILITHIUM_87:
395-
CKINT(lc_dilithium_pk_load(keys->pk.dilithium_pk, data, datalen));
394+
CKINT(lc_dilithium_pk_load(keys->pk.dilithium_pk, data,
395+
datalen));
396396
break;
397397
case LC_SIG_DILITHIUM_44_ED25519:
398398
case LC_SIG_DILITHIUM_65_ED25519:
399399
case LC_SIG_DILITHIUM_87_ED25519:
400400
CKINT(lc_dilithium_ed25519_pk_load(
401-
keys->pk.dilithium_ed25519_pk,
402-
data,
403-
datalen - LC_ED25519_PUBLICKEYBYTES,
404-
data + LC_ED25519_PUBLICKEYBYTES,
405-
LC_ED25519_PUBLICKEYBYTES));
401+
keys->pk.dilithium_ed25519_pk, data,
402+
datalen - LC_ED25519_PUBLICKEYBYTES,
403+
data + LC_ED25519_PUBLICKEYBYTES,
404+
LC_ED25519_PUBLICKEYBYTES));
406405
break;
407406
case LC_SIG_SPINCS_SHAKE_256S:
408407
case LC_SIG_SPINCS_SHAKE_192S:
@@ -456,7 +455,8 @@ int asym_set_signer(struct lc_x509_certificate *signed_x509,
456455
"Loading X.509 signer public key from certificate failed: %d\n",
457456
ret);
458457
CKINT_LOG(asym_set_dilithium_keypair(
459-
&signed_x509->sig_gen_data, signer_key_data->pk.dilithium_pk,
458+
&signed_x509->sig_gen_data,
459+
signer_key_data->pk.dilithium_pk,
460460
signer_key_data->sk.dilithium_sk),
461461
"Setting X.509 key pair for signing failed: %d\n",
462462
ret);
@@ -486,7 +486,8 @@ int asym_set_signer(struct lc_x509_certificate *signed_x509,
486486
signer_key_data->pk.sphincs_pk));
487487
load_sphincs:
488488
CKINT_LOG(asym_set_sphincs_keypair(
489-
&signed_x509->sig_gen_data, signer_key_data->pk.sphincs_pk,
489+
&signed_x509->sig_gen_data,
490+
signer_key_data->pk.sphincs_pk,
490491
signer_key_data->sk.sphincs_sk),
491492
"Setting X.509 key pair for signing\n");
492493
break;
@@ -529,70 +530,68 @@ int asym_gen_keypair(struct lc_x509_certificate *cert,
529530

530531
switch (create_keypair_algo) {
531532
case LC_SIG_DILITHIUM_44:
532-
CKINT(lc_dilithium_keypair(
533-
keys->pk.dilithium_pk, keys->sk.dilithium_sk,
534-
lc_seeded_rng, LC_DILITHIUM_44));
533+
CKINT(lc_dilithium_keypair(keys->pk.dilithium_pk,
534+
keys->sk.dilithium_sk, lc_seeded_rng,
535+
LC_DILITHIUM_44));
535536
goto load_dilithium;
536537
break;
537538
case LC_SIG_DILITHIUM_65:
538-
CKINT(lc_dilithium_keypair(
539-
keys->pk.dilithium_pk, keys->sk.dilithium_sk,
540-
lc_seeded_rng, LC_DILITHIUM_65));
539+
CKINT(lc_dilithium_keypair(keys->pk.dilithium_pk,
540+
keys->sk.dilithium_sk, lc_seeded_rng,
541+
LC_DILITHIUM_65));
541542
goto load_dilithium;
542543
break;
543544
case LC_SIG_DILITHIUM_87:
544-
CKINT(lc_dilithium_keypair(
545-
keys->pk.dilithium_pk, keys->sk.dilithium_sk,
546-
lc_seeded_rng, LC_DILITHIUM_87));
545+
CKINT(lc_dilithium_keypair(keys->pk.dilithium_pk,
546+
keys->sk.dilithium_sk, lc_seeded_rng,
547+
LC_DILITHIUM_87));
547548
load_dilithium:
548-
CKINT(asym_set_dilithium_keypair(
549-
&cert->sig_gen_data, keys->pk.dilithium_pk,
550-
keys->sk.dilithium_sk));
551-
CKINT(asym_set_dilithium_keypair(
552-
&cert->pub_gen_data, keys->pk.dilithium_pk,
553-
NULL));
549+
CKINT(asym_set_dilithium_keypair(&cert->sig_gen_data,
550+
keys->pk.dilithium_pk,
551+
keys->sk.dilithium_sk));
552+
CKINT(asym_set_dilithium_keypair(&cert->pub_gen_data,
553+
keys->pk.dilithium_pk, NULL));
554554
break;
555555
case LC_SIG_SPINCS_SHAKE_128F:
556-
CKINT(lc_sphincs_keypair(
557-
keys->pk.sphincs_pk, keys->sk.sphincs_sk,
558-
lc_seeded_rng, LC_SPHINCS_SHAKE_128f));
556+
CKINT(lc_sphincs_keypair(keys->pk.sphincs_pk,
557+
keys->sk.sphincs_sk, lc_seeded_rng,
558+
LC_SPHINCS_SHAKE_128f));
559559
goto load_sphincs;
560560
break;
561561
case LC_SIG_SPINCS_SHAKE_128S:
562-
CKINT(lc_sphincs_keypair(
563-
keys->pk.sphincs_pk, keys->sk.sphincs_sk,
564-
lc_seeded_rng, LC_SPHINCS_SHAKE_128s));
562+
CKINT(lc_sphincs_keypair(keys->pk.sphincs_pk,
563+
keys->sk.sphincs_sk, lc_seeded_rng,
564+
LC_SPHINCS_SHAKE_128s));
565565
goto load_sphincs;
566566
break;
567567
case LC_SIG_SPINCS_SHAKE_192F:
568-
CKINT(lc_sphincs_keypair(
569-
keys->pk.sphincs_pk, keys->sk.sphincs_sk,
570-
lc_seeded_rng, LC_SPHINCS_SHAKE_192f));
568+
CKINT(lc_sphincs_keypair(keys->pk.sphincs_pk,
569+
keys->sk.sphincs_sk, lc_seeded_rng,
570+
LC_SPHINCS_SHAKE_192f));
571571
goto load_sphincs;
572572
break;
573573
case LC_SIG_SPINCS_SHAKE_192S:
574-
CKINT(lc_sphincs_keypair(
575-
keys->pk.sphincs_pk, keys->sk.sphincs_sk,
576-
lc_seeded_rng, LC_SPHINCS_SHAKE_192s));
574+
CKINT(lc_sphincs_keypair(keys->pk.sphincs_pk,
575+
keys->sk.sphincs_sk, lc_seeded_rng,
576+
LC_SPHINCS_SHAKE_192s));
577577
goto load_sphincs;
578578
break;
579579
case LC_SIG_SPINCS_SHAKE_256F:
580-
CKINT(lc_sphincs_keypair(
581-
keys->pk.sphincs_pk, keys->sk.sphincs_sk,
582-
lc_seeded_rng, LC_SPHINCS_SHAKE_256f));
580+
CKINT(lc_sphincs_keypair(keys->pk.sphincs_pk,
581+
keys->sk.sphincs_sk, lc_seeded_rng,
582+
LC_SPHINCS_SHAKE_256f));
583583
goto load_sphincs;
584584
break;
585585
case LC_SIG_SPINCS_SHAKE_256S:
586-
CKINT(lc_sphincs_keypair(
587-
keys->pk.sphincs_pk, keys->sk.sphincs_sk,
588-
lc_seeded_rng, LC_SPHINCS_SHAKE_256s));
586+
CKINT(lc_sphincs_keypair(keys->pk.sphincs_pk,
587+
keys->sk.sphincs_sk, lc_seeded_rng,
588+
LC_SPHINCS_SHAKE_256s));
589589
load_sphincs:
590-
CKINT(asym_set_sphincs_keypair(
591-
&cert->sig_gen_data, keys->pk.sphincs_pk,
592-
keys->sk.sphincs_sk));
593-
CKINT(asym_set_sphincs_keypair(
594-
&cert->pub_gen_data, keys->pk.sphincs_pk,
595-
NULL));
590+
CKINT(asym_set_sphincs_keypair(&cert->sig_gen_data,
591+
keys->pk.sphincs_pk,
592+
keys->sk.sphincs_sk));
593+
CKINT(asym_set_sphincs_keypair(&cert->pub_gen_data,
594+
keys->pk.sphincs_pk, NULL));
596595
break;
597596
case LC_SIG_DILITHIUM_44_ED25519:
598597
CKINT(lc_dilithium_ed25519_keypair(
@@ -615,11 +614,11 @@ int asym_gen_keypair(struct lc_x509_certificate *cert,
615614
LC_DILITHIUM_87));
616615
load_dilithium_ed25519:
617616
CKINT(asym_set_dilithium_ed25519_keypair(
618-
&cert->sig_gen_data, keys->pk.dilithium_ed25519_pk,
619-
keys->sk.dilithium_ed25519_sk));
617+
&cert->sig_gen_data, keys->pk.dilithium_ed25519_pk,
618+
keys->sk.dilithium_ed25519_sk));
620619
CKINT(asym_set_dilithium_ed25519_keypair(
621-
&cert->pub_gen_data, keys->pk.dilithium_ed25519_pk,
622-
NULL));
620+
&cert->pub_gen_data, keys->pk.dilithium_ed25519_pk,
621+
NULL));
623622
break;
624623
case LC_SIG_DILITHIUM_87_ED448:
625624
case LC_SIG_ECDSA_X963:
@@ -649,35 +648,33 @@ int asym_load_keypair(struct lc_x509_certificate *cert,
649648
case LC_SIG_DILITHIUM_44:
650649
case LC_SIG_DILITHIUM_65:
651650
case LC_SIG_DILITHIUM_87:
652-
CKINT(asym_set_dilithium_keypair(
653-
&cert->sig_gen_data, keys->pk.dilithium_pk,
654-
keys->sk.dilithium_sk));
655-
CKINT(asym_set_dilithium_keypair(
656-
&cert->pub_gen_data, keys->pk.dilithium_pk,
657-
NULL));
651+
CKINT(asym_set_dilithium_keypair(&cert->sig_gen_data,
652+
keys->pk.dilithium_pk,
653+
keys->sk.dilithium_sk));
654+
CKINT(asym_set_dilithium_keypair(&cert->pub_gen_data,
655+
keys->pk.dilithium_pk, NULL));
658656
break;
659657
case LC_SIG_SPINCS_SHAKE_128F:
660658
case LC_SIG_SPINCS_SHAKE_192F:
661659
case LC_SIG_SPINCS_SHAKE_256F:
662660
case LC_SIG_SPINCS_SHAKE_128S:
663661
case LC_SIG_SPINCS_SHAKE_192S:
664662
case LC_SIG_SPINCS_SHAKE_256S:
665-
CKINT(asym_set_sphincs_keypair(
666-
&cert->sig_gen_data, keys->pk.sphincs_pk,
667-
keys->sk.sphincs_sk));
668-
CKINT(asym_set_sphincs_keypair(
669-
&cert->pub_gen_data, keys->pk.sphincs_pk,
670-
NULL));
663+
CKINT(asym_set_sphincs_keypair(&cert->sig_gen_data,
664+
keys->pk.sphincs_pk,
665+
keys->sk.sphincs_sk));
666+
CKINT(asym_set_sphincs_keypair(&cert->pub_gen_data,
667+
keys->pk.sphincs_pk, NULL));
671668
break;
672669
case LC_SIG_DILITHIUM_44_ED25519:
673670
case LC_SIG_DILITHIUM_65_ED25519:
674671
case LC_SIG_DILITHIUM_87_ED25519:
675672
CKINT(asym_set_dilithium_ed25519_keypair(
676-
&cert->sig_gen_data, keys->pk.dilithium_ed25519_pk,
677-
keys->sk.dilithium_ed25519_sk));
673+
&cert->sig_gen_data, keys->pk.dilithium_ed25519_pk,
674+
keys->sk.dilithium_ed25519_sk));
678675
CKINT(asym_set_dilithium_ed25519_keypair(
679-
&cert->pub_gen_data, keys->pk.dilithium_ed25519_pk,
680-
NULL));
676+
&cert->pub_gen_data, keys->pk.dilithium_ed25519_pk,
677+
NULL));
681678
break;
682679
case LC_SIG_DILITHIUM_87_ED448:
683680
case LC_SIG_ECDSA_X963:

0 commit comments

Comments
 (0)