diff options
| author | Tomas Mraz <tomas@openssl.org> | 2022-01-13 19:01:33 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-01-17 16:23:29 +0100 |
| commit | 8bb90f43aa732efb9530edc2ab3767b228d5d9da (patch) | |
| tree | f3aec65f35a09e9d7c04e39bb35f69b54faef467 | |
| parent | 554addd65b6ce9ee0b8f1d6c4115ef192d693f4f (diff) | |
Do not call ossl_ffc_name_to_dh_named_group with NULL argument
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17498)
(cherry picked from commit 3b53f88c008d288e86d2bbdc0c4e2d16c29fcee8)
| -rw-r--r-- | crypto/ffc/ffc_backend.c | 1 | ||||
| -rw-r--r-- | providers/implementations/keymgmt/dh_kmgmt.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/crypto/ffc/ffc_backend.c b/crypto/ffc/ffc_backend.c index b227186934..b387f966cc 100644 --- a/crypto/ffc/ffc_backend.c +++ b/crypto/ffc/ffc_backend.c @@ -37,6 +37,7 @@ int ossl_ffc_params_fromdata(FFC_PARAMS *ffc, const OSSL_PARAM params[]) const DH_NAMED_GROUP *group = NULL; if (prm->data_type != OSSL_PARAM_UTF8_STRING + || prm->data == NULL || (group = ossl_ffc_name_to_dh_named_group(prm->data)) == NULL || !ossl_ffc_named_group_set_pqg(ffc, group)) #endif diff --git a/providers/implementations/keymgmt/dh_kmgmt.c b/providers/implementations/keymgmt/dh_kmgmt.c index 98eb882e3f..ab8ef3ac52 100644 --- a/providers/implementations/keymgmt/dh_kmgmt.c +++ b/providers/implementations/keymgmt/dh_kmgmt.c @@ -532,6 +532,7 @@ static int dh_gen_common_set_params(void *genctx, const OSSL_PARAM params[]) const DH_NAMED_GROUP *group = NULL; if (p->data_type != OSSL_PARAM_UTF8_STRING + || p->data == NULL || (group = ossl_ffc_name_to_dh_named_group(p->data)) == NULL || ((gctx->group_nid = ossl_ffc_named_group_get_uid(group)) == NID_undef)) { |