Skip to content

Commit 8ce74df

Browse files
TJ-91antonsviridenko
TJ-91
authored and
antonsviridenko
committed
remove resolving feature state of ML_KEM_INITIAL_PUBLIC_DRAFT again
clang format
1 parent 5becc14 commit 8ce74df

File tree

13 files changed

+57
-70
lines changed

13 files changed

+57
-70
lines changed

‎include/repgp/repgp_def.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ typedef enum : uint8_t {
231231
PGP_PKA_ED25519 = 27, /* v6 / Crypto Refresh */
232232
#endif
233233

234-
PGP_PKA_SM2 = 99, /* SM2 encryption/signature schemes */
234+
PGP_PKA_SM2 = 99, /* SM2 encryption/signature schemes */
235235

236236
#if defined(ENABLE_PQC)
237237
/* PQC-ECC composite */

‎include/rnp/rnp.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1959,7 +1959,6 @@ RNP_API rnp_result_t rnp_key_get_alg(rnp_key_handle_t key, char **alg);
19591959
*/
19601960
RNP_API rnp_result_t rnp_key_sphincsplus_get_param(rnp_key_handle_t handle, char **param);
19611961

1962-
19631962
/** Get number of bits in the key. For EC-based keys it will return size of the curve.
19641963
*
19651964
* @param key key handle

‎src/lib/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ if(CRYPTO_BACKEND_BOTAN)
184184
resolve_feature_state(ENABLE_TWOFISH "TWOFISH")
185185
resolve_feature_state(ENABLE_IDEA "IDEA")
186186
resolve_feature_state(ENABLE_CRYPTO_REFRESH "HKDF")
187-
resolve_feature_state(ENABLE_PQC "KMAC;DILITHIUM;KYBER;ML_KEM_INITIAL_PUBLIC_DRAFT;SPHINCS_PLUS_WITH_SHA2;SPHINCS_PLUS_WITH_SHAKE")
187+
resolve_feature_state(ENABLE_PQC "KMAC;DILITHIUM;KYBER;SPHINCS_PLUS_WITH_SHA2;SPHINCS_PLUS_WITH_SHAKE")
188188
resolve_feature_state(ENABLE_BLOWFISH "BLOWFISH")
189189
resolve_feature_state(ENABLE_CAST5 "CAST_128")
190190
resolve_feature_state(ENABLE_RIPEMD160 "RIPEMD_160")

‎src/lib/generate-key.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,10 +341,10 @@ set_default_user_prefs(pgp_user_prefs_t &prefs)
341341
DEFAULT_COMPRESS_ALGS, DEFAULT_COMPRESS_ALGS + ARRAY_SIZE(DEFAULT_COMPRESS_ALGS)));
342342
}
343343
#if defined(ENABLE_CRYPTO_REFRESH)
344-
if(prefs.aead_prefs.empty()) {
344+
if (prefs.aead_prefs.empty()) {
345345
std::vector<uint8_t> algs;
346-
for(auto aead_alg : DEFAULT_AEAD_ALGS) {
347-
for(auto sym_alg : prefs.symm_algs) {
346+
for (auto aead_alg : DEFAULT_AEAD_ALGS) {
347+
for (auto sym_alg : prefs.symm_algs) {
348348
algs.push_back(sym_alg);
349349
algs.push_back(aead_alg);
350350
}

‎src/lib/pgp-key.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -586,9 +586,8 @@ pgp_user_prefs_t::set_aead_prefs(const std::vector<uint8_t> &algs)
586586
void
587587
pgp_user_prefs_t::add_aead_prefs(pgp_symm_alg_t sym_alg, pgp_aead_alg_t aead_alg)
588588
{
589-
for(size_t i = 0; i < aead_prefs.size(); i+=2)
590-
{
591-
if(aead_prefs[i] == sym_alg && aead_prefs[i+1] == aead_alg) {
589+
for (size_t i = 0; i < aead_prefs.size(); i += 2) {
590+
if (aead_prefs[i] == sym_alg && aead_prefs[i + 1] == aead_alg) {
592591
return;
593592
}
594593
}

‎src/lib/rnp.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -221,14 +221,13 @@ static const id_str_pair hash_alg_map[] = {{PGP_HASH_MD5, RNP_ALGNAME_MD5},
221221
{0, NULL}};
222222

223223
#if defined(ENABLE_PQC)
224-
static const id_str_pair sphincsplus_params_map[] = {
225-
{sphincsplus_simple_128s, "128s"},
226-
{sphincsplus_simple_128f, "128f"},
227-
{sphincsplus_simple_192s, "192s"},
228-
{sphincsplus_simple_192f, "192f"},
229-
{sphincsplus_simple_256s, "256s"},
230-
{sphincsplus_simple_256f, "256f"},
231-
{0, NULL}};
224+
static const id_str_pair sphincsplus_params_map[] = {{sphincsplus_simple_128s, "128s"},
225+
{sphincsplus_simple_128f, "128f"},
226+
{sphincsplus_simple_192s, "192s"},
227+
{sphincsplus_simple_192f, "192f"},
228+
{sphincsplus_simple_256s, "256s"},
229+
{sphincsplus_simple_256f, "256f"},
230+
{0, NULL}};
232231
#endif
233232

234233
static const id_str_pair s2k_type_map[] = {
@@ -6802,11 +6801,12 @@ try {
68026801
return RNP_ERROR_NULL_POINTER;
68036802
}
68046803
pgp_key_t *key = get_key_prefer_public(handle);
6805-
if(key->alg() != PGP_PKA_SPHINCSPLUS_SHA2 && key->alg() != PGP_PKA_SPHINCSPLUS_SHAKE) {
6804+
if (key->alg() != PGP_PKA_SPHINCSPLUS_SHA2 && key->alg() != PGP_PKA_SPHINCSPLUS_SHAKE) {
68066805
return RNP_ERROR_BAD_PARAMETERS;
68076806
}
68086807

6809-
return get_map_value(sphincsplus_params_map, key->material().sphincsplus.pub.param(), param);
6808+
return get_map_value(
6809+
sphincsplus_params_map, key->material().sphincsplus.pub.param(), param);
68106810
#else
68116811
return RNP_ERROR_NOT_IMPLEMENTED;
68126812
#endif

‎src/librepgp/stream-parse.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1728,7 +1728,8 @@ encrypted_try_key(pgp_source_encrypted_param_t *param,
17281728
#endif
17291729

17301730
#if defined(ENABLE_PQC_DBG_LOG)
1731-
RNP_LOG_U8VEC("Session Key: %s", std::vector<uint8_t>(decbuf_sesskey, decbuf_sesskey + keylen));
1731+
RNP_LOG_U8VEC("Session Key: %s",
1732+
std::vector<uint8_t>(decbuf_sesskey, decbuf_sesskey + keylen));
17321733
#endif
17331734

17341735
#if defined(ENABLE_CRYPTO_REFRESH) || defined(ENABLE_PQC)

‎src/librepgp/stream-sig.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ pgp_sig_subpkt_t::parse()
404404
break;
405405
#if defined(ENABLE_CRYPTO_REFRESH)
406406
case PGP_SIG_SUBPKT_PREFERRED_AEAD_CIPHERSUITES:
407-
if(len % 2 != 0) {
407+
if (len % 2 != 0) {
408408
RNP_LOG("AEAD Ciphersuite Preferences must contain an even number of bytes");
409409
return false;
410410
}
@@ -1864,11 +1864,10 @@ rnp_selfsig_cert_info_t::populate(pgp_signature_t &sig)
18641864
sig.set_key_flags(key_flags);
18651865
}
18661866
return;
1867-
}
1868-
else if ((sig.version == PGP_V6) && (sig.type() == PGP_SIG_DIRECT)) {
1867+
} else if ((sig.version == PGP_V6) && (sig.type() == PGP_SIG_DIRECT)) {
18691868
/* set some additional packets for v6 direct-key self signatures */
18701869
sig.set_key_features(PGP_KEY_FEATURE_MDC | PGP_KEY_FEATURE_SEIPDV2);
1871-
if(!prefs.aead_prefs.empty()) {
1870+
if (!prefs.aead_prefs.empty()) {
18721871
sig.set_preferred_aead_algs(prefs.aead_prefs);
18731872
}
18741873
}

‎src/librepgp/stream-write.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,8 @@ encrypted_add_recipient(pgp_write_handler_t *handler,
651651
}
652652

653653
#if defined(ENABLE_PQC_DBG_LOG)
654-
RNP_LOG_U8VEC("Session Key: %s", std::vector<uint8_t>(enckey.data(), enckey.data() + keylen));
654+
RNP_LOG_U8VEC("Session Key: %s",
655+
std::vector<uint8_t>(enckey.data(), enckey.data() + keylen));
655656
#endif
656657

657658
pgp_encrypted_material_t material;

‎src/rnp/fficli.cpp‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ ffi_pass_callback_stdin(rnp_ffi_t ffi,
420420
}
421421

422422
rnp->reuse_password_for_subkey--;
423-
if(rnp->reuse_password_for_subkey == 0) {
423+
if (rnp->reuse_password_for_subkey == 0) {
424424
rnp_buffer_clear(rnp->reused_password, strnlen(rnp->reused_password, buf_len));
425425
free(rnp->reused_password);
426426
rnp->reused_password = NULL;
@@ -1376,10 +1376,9 @@ cli_rnp_print_key_info(FILE *fp, rnp_ffi_t ffi, rnp_key_handle_t key, bool psecr
13761376
fprintf(fp, "%s", cli_rnp_normalize_key_alg(alg));
13771377
#if defined(ENABLE_PQC)
13781378
// in case of a SPHINCS+ key, also print the parameter set
1379-
char *param;
1379+
char * param;
13801380
rnp_result_t res = rnp_key_sphincsplus_get_param(key, &param);
1381-
if(res == RNP_SUCCESS)
1382-
{
1381+
if (res == RNP_SUCCESS) {
13831382
fprintf(fp, "-%s", param);
13841383
rnp_buffer_destroy(param);
13851384
}
@@ -1546,9 +1545,9 @@ cli_rnp_generate_key(cli_rnp_t *rnp, const char *username)
15461545
rnp_key_handle_t primary = NULL;
15471546
rnp_key_handle_t subkey = NULL;
15481547
#if defined(ENABLE_PQC)
1549-
rnp_key_handle_t subkey2 = NULL;
1548+
rnp_key_handle_t subkey2 = NULL;
15501549
#endif
1551-
bool res = false;
1550+
bool res = false;
15521551

15531552
if (rnp_op_generate_create(&genkey, rnp->ffi, cfg.get_cstr(CFG_KG_PRIMARY_ALG))) {
15541553
ERR_MSG("Failed to initialize key generation.");
@@ -1644,8 +1643,8 @@ cli_rnp_generate_key(cli_rnp_t *rnp, const char *username)
16441643
#endif
16451644
#if defined(ENABLE_PQC)
16461645
if (cfg.has(CFG_KG_SUBKEY_SPHINCSPLUS_PARAM) &&
1647-
rnp_op_generate_set_sphincsplus_param(
1648-
genkey, cfg.get_cstr(CFG_KG_SUBKEY_SPHINCSPLUS_PARAM))) {
1646+
rnp_op_generate_set_sphincsplus_param(genkey,
1647+
cfg.get_cstr(CFG_KG_SUBKEY_SPHINCSPLUS_PARAM))) {
16491648
ERR_MSG("Failed to set sphincsplus parameter.");
16501649
goto done;
16511650
}
@@ -1656,11 +1655,11 @@ cli_rnp_generate_key(cli_rnp_t *rnp, const char *username)
16561655
}
16571656

16581657
#if defined(ENABLE_PQC)
1659-
if(cfg.has(CFG_KG_SUBKEY_2_ALG)) {
1658+
if (cfg.has(CFG_KG_SUBKEY_2_ALG)) {
16601659
rnp_op_generate_destroy(genkey);
16611660
genkey = NULL;
16621661
if (rnp_op_generate_subkey_create(
1663-
&genkey, rnp->ffi, primary, cfg.get_cstr(CFG_KG_SUBKEY_2_ALG))) {
1662+
&genkey, rnp->ffi, primary, cfg.get_cstr(CFG_KG_SUBKEY_2_ALG))) {
16641663
ERR_MSG("Failed to initialize subkey 2 generation.");
16651664
goto done;
16661665
}
@@ -1687,14 +1686,14 @@ cli_rnp_generate_key(cli_rnp_t *rnp, const char *username)
16871686
ERR_MSG("Failed to set hash algorithm.");
16881687
goto done;
16891688
}
1690-
#if defined(ENABLE_CRYPTO_REFRESH)
1689+
#if defined(ENABLE_CRYPTO_REFRESH)
16911690
if (cfg.get_bool(CFG_KG_V6_KEY)) {
16921691
rnp_op_generate_set_v6_key(genkey);
16931692
}
1694-
#endif
1693+
#endif
16951694
if (cfg.has(CFG_KG_SUBKEY_2_SPHINCSPLUS_PARAM) &&
16961695
rnp_op_generate_set_sphincsplus_param(
1697-
genkey, cfg.get_cstr(CFG_KG_SUBKEY_2_SPHINCSPLUS_PARAM))) {
1696+
genkey, cfg.get_cstr(CFG_KG_SUBKEY_2_SPHINCSPLUS_PARAM))) {
16981697
ERR_MSG("Failed to set sphincsplus parameter.");
16991698
goto done;
17001699
}
@@ -1708,7 +1707,7 @@ cli_rnp_generate_key(cli_rnp_t *rnp, const char *username)
17081707
// protect
17091708
#if defined(ENABLE_PQC)
17101709
for (auto key : {primary, subkey, subkey2}) {
1711-
if(!key) {
1710+
if (!key) {
17121711
continue;
17131712
}
17141713
#else
@@ -1748,7 +1747,6 @@ cli_rnp_generate_key(cli_rnp_t *rnp, const char *username)
17481747
cli_rnp_print_key_info(stdout, rnp->ffi, subkey2, true, false);
17491748
}
17501749
#endif
1751-
17521750
}
17531751
rnp_op_generate_destroy(genkey);
17541752
rnp_key_handle_destroy(primary);

0 commit comments

Comments
 (0)