public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More consistent ML-KEM key checks

Browse source 
- Cross-check seed `z` value on import as well as load.
- In import/load When re-generating from a seed, check hash of any
  explicit private key when both provided.
- Avoid leak of expanded key encoding when load fails.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26812)
This commit is contained in:
Viktor Dukhovni 2025-02-18 18:42:41 +11:00
parent ff20db213d
commit a4465bf694
3 changed files with 78 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crypto/encode_decode/decoder_pkey.c
View file

@ -149,15 +149,7 @@ static int decoder_construct_pkey(OSSL_DECODER_INSTANCE *decoder_inst,
* result in the keymgmt.
*/
if (keymgmt_prov == decoder_prov) {
/*
* When load returns NULL, because, though the provided key material
* is syntactically valid (parsed OK), it is not an acceptable key,
* the reason why the key is rejected would be lost, unless we
* signal a hard error, and suppress resetting for another try.
*/
keydata = evp_keymgmt_load(keymgmt, object_ref, object_ref_sz);
if (keydata == NULL)
ossl_decoder_ctx_set_harderr(data->ctx);
} else {
struct evp_keymgmt_util_try_import_data_st import_data;
@ -180,6 +172,14 @@ static int decoder_construct_pkey(OSSL_DECODER_INSTANCE *decoder_inst,
keydata = import_data.keydata;
import_data.keydata = NULL;
}
/*
* When load or import fails, because this is not an acceptable key
* (despite the provided key material being syntactically valid), the
* reason why the key is rejected would be lost, unless we signal a
* hard error, and suppress resetting for another try.
*/
if (keydata == NULL)
ossl_decoder_ctx_set_harderr(data->ctx);
if (keydata != NULL
&& (pkey = evp_keymgmt_util_make_pkey(keymgmt, keydata)) == NULL)