diff options
| author | Pauli <ppzgs1@gmail.com> | 2021-02-25 04:51:28 +0100 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-02-28 08:25:49 +0100 |
| commit | 19ea8a8a215c2fc637b3e3664c75fc0636189459 (patch) | |
| tree | 22b2c90247a870cd335b3679d637c23d53ca3a27 /providers | |
| parent | fips: update to use the extra MAC init arguments (diff) | |
| download | openssl-19ea8a8a215c2fc637b3e3664c75fc0636189459.tar.xz openssl-19ea8a8a215c2fc637b3e3664c75fc0636189459.zip | |
prov: update provider util to be less agressive about changing things unnecessarily
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/common/provider_util.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/providers/common/provider_util.c b/providers/common/provider_util.c index 0df2addccb..6ed4378a2f 100644 --- a/providers/common/provider_util.c +++ b/providers/common/provider_util.c @@ -72,6 +72,9 @@ int ossl_prov_cipher_load_from_params(PROV_CIPHER *pc, const OSSL_PARAM *p; const char *propquery; + if (params == NULL) + return 1; + if (!load_common(params, &propquery, &pc->engine)) return 0; @@ -140,10 +143,12 @@ int ossl_prov_digest_load_from_params(PROV_DIGEST *pd, const OSSL_PARAM *p; const char *propquery; + if (params == NULL) + return 1; + if (!load_common(params, &propquery, &pd->engine)) return 0; - p = OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_DIGEST); if (p == NULL) return 1; |