Fix gettable_params() for ECX
The OSSL_PKEY_PARAM_MANDATORY_DIGEST parameter is only handled by the
ed25519_get_params() and ed448_get_params(). The x25519 and x448
versions of get_params() always ignore that parameter, so it should not
be in the list of gettable params.
Fixes: 1a7328c882
("PROV: Ensure that ED25519 & ED448 keys have a mandatory digest")
cla: trivial
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/27043)
This commit is contained in:
parent
978e23a472
commit
482d3f9338
1 changed files with 1 additions and 1 deletions
|
@ -359,7 +359,6 @@ static const OSSL_PARAM ecx_gettable_params[] = {
|
||||||
OSSL_PARAM_int(OSSL_PKEY_PARAM_BITS, NULL),
|
OSSL_PARAM_int(OSSL_PKEY_PARAM_BITS, NULL),
|
||||||
OSSL_PARAM_int(OSSL_PKEY_PARAM_SECURITY_BITS, NULL),
|
OSSL_PARAM_int(OSSL_PKEY_PARAM_SECURITY_BITS, NULL),
|
||||||
OSSL_PARAM_int(OSSL_PKEY_PARAM_MAX_SIZE, NULL),
|
OSSL_PARAM_int(OSSL_PKEY_PARAM_MAX_SIZE, NULL),
|
||||||
OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_MANDATORY_DIGEST, NULL, 0),
|
|
||||||
OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY, NULL, 0),
|
OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY, NULL, 0),
|
||||||
ECX_KEY_TYPES(),
|
ECX_KEY_TYPES(),
|
||||||
OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
|
OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
|
||||||
|
@ -370,6 +369,7 @@ static const OSSL_PARAM ed_gettable_params[] = {
|
||||||
OSSL_PARAM_int(OSSL_PKEY_PARAM_BITS, NULL),
|
OSSL_PARAM_int(OSSL_PKEY_PARAM_BITS, NULL),
|
||||||
OSSL_PARAM_int(OSSL_PKEY_PARAM_SECURITY_BITS, NULL),
|
OSSL_PARAM_int(OSSL_PKEY_PARAM_SECURITY_BITS, NULL),
|
||||||
OSSL_PARAM_int(OSSL_PKEY_PARAM_MAX_SIZE, NULL),
|
OSSL_PARAM_int(OSSL_PKEY_PARAM_MAX_SIZE, NULL),
|
||||||
|
OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_MANDATORY_DIGEST, NULL, 0),
|
||||||
ECX_KEY_TYPES(),
|
ECX_KEY_TYPES(),
|
||||||
OSSL_PARAM_END
|
OSSL_PARAM_END
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue