diff options
author | Richard Levitte <levitte@openssl.org> | 2020-11-07 11:31:35 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2021-02-05 14:16:17 +0100 |
commit | 93d6132a79d85127dffa1ce4e62b264cf38c296d (patch) | |
tree | 597c4d283c2527adc02d9b2ba00a23494cceca67 | |
parent | 93bae03abfdb1cb8047c2bef85e48b60891ecf54 (diff) |
EVP: use evp_pkey_copy_downgraded() in EVP_PKEY_copy_parameters()
We used evp_pkey_downgrade() on 'from', which permanently converts 'from'
to have a legacy internal key. Now that we have evp_pkey_copy_downgraded(),
it's better to use that (and thereby restore the constness contract).
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13341)
-rw-r--r-- | crypto/evp/p_lib.c | 53 |
1 files changed, 31 insertions, 22 deletions
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index 106830bfbb..95cc15e9d7 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -117,13 +117,18 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from) * Clean up legacy stuff from this function when legacy support is gone. */ + EVP_PKEY *downgraded_from = NULL; + int ok = 0; + /* - * If |to| is a legacy key and |from| isn't, we must downgrade |from|. - * If that fails, this function fails. + * If |to| is a legacy key and |from| isn't, we must make a downgraded + * copy of |from|. If that fails, this function fails. */ - if (evp_pkey_is_legacy(to) && evp_pkey_is_provided(from)) - if (!evp_pkey_downgrade((EVP_PKEY *)from)) - return 0; + if (evp_pkey_is_legacy(to) && evp_pkey_is_provided(from)) { + if (!evp_pkey_copy_downgraded(&downgraded_from, from)) + goto end; + from = downgraded_from; + } /* * Make sure |to| is typed. Content is less important at this early @@ -140,33 +145,36 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from) if (evp_pkey_is_blank(to)) { if (evp_pkey_is_legacy(from)) { if (EVP_PKEY_set_type(to, from->type) == 0) - return 0; + goto end; } else { if (EVP_PKEY_set_type_by_keymgmt(to, from->keymgmt) == 0) - return 0; + goto end; } } else if (evp_pkey_is_legacy(to)) { if (to->type != from->type) { ERR_raise(ERR_LIB_EVP, EVP_R_DIFFERENT_KEY_TYPES); - goto err; + goto end; } } if (EVP_PKEY_missing_parameters(from)) { ERR_raise(ERR_LIB_EVP, EVP_R_MISSING_PARAMETERS); - goto err; + goto end; } if (!EVP_PKEY_missing_parameters(to)) { if (EVP_PKEY_parameters_eq(to, from) == 1) - return 1; - ERR_raise(ERR_LIB_EVP, EVP_R_DIFFERENT_PARAMETERS); - return 0; + ok = 1; + else + ERR_raise(ERR_LIB_EVP, EVP_R_DIFFERENT_PARAMETERS); + goto end; } /* For purely provided keys, we just call the keymgmt utility */ - if (to->keymgmt != NULL && from->keymgmt != NULL) - return evp_keymgmt_util_copy(to, (EVP_PKEY *)from, SELECT_PARAMETERS); + if (to->keymgmt != NULL && from->keymgmt != NULL) { + ok = evp_keymgmt_util_copy(to, (EVP_PKEY *)from, SELECT_PARAMETERS); + goto end; + } /* * If |to| is provided, we know that |from| is legacy at this point. @@ -183,19 +191,20 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from) * If we get a NULL, it could be an internal error, or it could be * that there's a key mismatch. We're pretending the latter... */ - if (from_keydata == NULL) { + if (from_keydata == NULL) ERR_raise(ERR_LIB_EVP, EVP_R_DIFFERENT_KEY_TYPES); - return 0; - } - return evp_keymgmt_copy(to->keymgmt, to->keydata, from_keydata, - SELECT_PARAMETERS); + else + ok = evp_keymgmt_copy(to->keymgmt, to->keydata, from_keydata, + SELECT_PARAMETERS); + goto end; } /* Both keys are legacy */ if (from->ameth != NULL && from->ameth->param_copy != NULL) - return from->ameth->param_copy(to, from); - err: - return 0; + ok = from->ameth->param_copy(to, from); + end: + EVP_PKEY_free(downgraded_from); + return ok; } int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey) |