diff options
| author | Pauli <paul.dale@oracle.com> | 2020-04-23 20:31:12 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-04-25 18:46:32 +1000 |
| commit | 54b47afedb82822b33a72bb804157a425d2201ff (patch) | |
| tree | a0c14c1ac6ae9be373abe76eb0eb922803e2c1f3 /crypto/evp/keymgmt_lib.c | |
| parent | 3873887e89ff12e7dc2cb7c166f21c79347da519 (diff) | |
| download | openssl-new-54b47afedb82822b33a72bb804157a425d2201ff.tar.gz | |
keymgmt: convert to use the params modification detection.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11601)
Diffstat (limited to 'crypto/evp/keymgmt_lib.c')
| -rw-r--r-- | crypto/evp/keymgmt_lib.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/crypto/evp/keymgmt_lib.c b/crypto/evp/keymgmt_lib.c index 9ed176410a..3493ceb3cb 100644 --- a/crypto/evp/keymgmt_lib.c +++ b/crypto/evp/keymgmt_lib.c @@ -432,25 +432,23 @@ int evp_keymgmt_util_get_deflt_digest_name(EVP_KEYMGMT *keymgmt, params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_DEFAULT_DIGEST, mddefault, sizeof(mddefault)); - params[0].return_size = sizeof(mddefault) + 1; params[1] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_MANDATORY_DIGEST, mdmandatory, sizeof(mdmandatory)); - params[1].return_size = sizeof(mdmandatory) + 1; params[2] = OSSL_PARAM_construct_end(); if (!evp_keymgmt_get_params(keymgmt, keydata, params)) return 0; - if (params[1].return_size != sizeof(mdmandatory) + 1) { - if (params[1].return_size == 1) /* Only a NUL byte */ + if (OSSL_PARAM_modified(params + 1)) { + if (params[1].return_size <= 1) /* Only a NUL byte */ result = SN_undef; else result = mdmandatory; rv = 2; - } else if (params[0].return_size != sizeof(mddefault) + 1) { - if (params[0].return_size == 1) /* Only a NUL byte */ + } else if (OSSL_PARAM_modified(params)) { + if (params[0].return_size <= 1) /* Only a NUL byte */ result = SN_undef; else result = mddefault; |