mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

slh-dsa: change the seed parameter name from entropy to seed

Browse Source 
This brings it inline with the same parameter for ML-KEM and ML-DSA.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/26750)
This commit is contained in:
Pauli 2025-02-17 09:53:10 +11:00
parent ac77e0697a
commit 73e01df48d
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/man7/EVP_PKEY-SLH-DSA.pod
View File

@ -35,7 +35,7 @@ elements randomly, the final public key element is computed from these values.
=over 4
=item "entropy" (B<OOSSL_PKEY_PARAM_SLH_DSA_ENTROPY>) <octet string>
=item "seed" (B<OSSL_PKEY_PARAM_SLH_DSA_SEED>) <octet string>
Supplies values to use for the private seed, private prf and
public seed instead of generating random values. This is used for testing

2
providers/fips/self_test_data.inc
View File

@ -2872,7 +2872,7 @@ static const uint8_t slh_dsa_sha2_128s_keygen_pub[] = {
0xca, 0xe3, 0xd1, 0x86, 0x52, 0x15, 0xe3, 0xd3, 0x85, 0x0e, 0x8c, 0x1b, 0x82, 0x92, 0xbf, 0x42,
};
static const ST_KAT_PARAM slh_dsa_sha2_128s_keygen_init_params[] = {
ST_KAT_PARAM_OCTET(OSSL_PKEY_PARAM_SLH_DSA_ENTROPY,
ST_KAT_PARAM_OCTET(OSSL_PKEY_PARAM_SLH_DSA_SEED,
slh_dsa_sha2_128s_keygen_entropy),
ST_KAT_PARAM_END()
};

4
providers/implementations/keymgmt/slh_dsa_kmgmt.c
View File

@ -363,7 +363,7 @@ static int slh_dsa_gen_set_params(void *genctx, const OSSL_PARAM params[])
if (gctx == NULL)
return 0;
p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_SLH_DSA_ENTROPY);
p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_SLH_DSA_SEED);
if (p != NULL) {
void *vp = gctx->entropy;
size_t len = sizeof(gctx->entropy);
@ -391,7 +391,7 @@ static const OSSL_PARAM *slh_dsa_gen_settable_params(ossl_unused void *genctx,
{
static OSSL_PARAM settable[] = {
OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_PROPERTIES, NULL, 0),
OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_SLH_DSA_ENTROPY, NULL, 0),
OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_SLH_DSA_SEED, NULL, 0),
OSSL_PARAM_END
};
return settable;

8
test/slh_dsa_test.c
View File

@ -296,15 +296,15 @@ err:
}
static EVP_PKEY *do_gen_key(const char *alg,
const uint8_t *entropy, size_t entropy_len)
const uint8_t *seed, size_t seed_len)
{
EVP_PKEY *pkey = NULL;
EVP_PKEY_CTX *ctx = NULL;
OSSL_PARAM params[2], *p = params;
if (entropy_len != 0)
*p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_SLH_DSA_ENTROPY,
(char *)entropy, entropy_len);
if (seed_len != 0)
*p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_SLH_DSA_SEED,
(char *)seed, seed_len);
*p = OSSL_PARAM_construct_end();
if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(lib_ctx, alg, NULL))

2
util/perl/OpenSSL/paramnames.pm
View File

@ -446,7 +446,7 @@ my %params = (
'PKEY_PARAM_ML_DSA_OUTPUT_FORMATS' => "ml-dsa.output_formats",
# SLH_DSA Key generation parameters
'PKEY_PARAM_SLH_DSA_ENTROPY' => "entropy",
'PKEY_PARAM_SLH_DSA_SEED' => "seed",
# Key Exchange parameters
'EXCHANGE_PARAM_PAD' => "pad",# uint