QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-04-28 18:54:36 +00:00
Code Issues Projects Releases Wiki Activity

EVP: use evp_pkey_copy_downgraded() in EVP_PKEY_copy_parameters()

Browse Source 
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)
This commit is contained in:
Richard Levitte 2020-11-07 11:31:35 +01:00
parent 93bae03abf
commit 93d6132a79
1 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
crypto/evp/p_lib.c
View File

@ -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. * 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 |to| is a legacy key and |from| isn't, we must make a downgraded
* If that fails, this function fails. * copy of |from|. If that fails, this function fails.
*/ */
if (evp_pkey_is_legacy(to) && evp_pkey_is_provided(from)) if (evp_pkey_is_legacy(to) && evp_pkey_is_provided(from)) {
if (!evp_pkey_downgrade((EVP_PKEY *)from)) if (!evp_pkey_copy_downgraded(&downgraded_from, from))
return 0; goto end;
from = downgraded_from;
}
/* /*
* Make sure |to| is typed. Content is less important at this early * 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_blank(to)) {
if (evp_pkey_is_legacy(from)) { if (evp_pkey_is_legacy(from)) {
if (EVP_PKEY_set_type(to, from->type) == 0) if (EVP_PKEY_set_type(to, from->type) == 0)
return 0; goto end;
} else { } else {
if (EVP_PKEY_set_type_by_keymgmt(to, from->keymgmt) == 0) if (EVP_PKEY_set_type_by_keymgmt(to, from->keymgmt) == 0)
return 0; goto end;
} }
} else if (evp_pkey_is_legacy(to)) { } else if (evp_pkey_is_legacy(to)) {
if (to->type != from->type) { if (to->type != from->type) {
ERR_raise(ERR_LIB_EVP, EVP_R_DIFFERENT_KEY_TYPES); ERR_raise(ERR_LIB_EVP, EVP_R_DIFFERENT_KEY_TYPES);
goto err; goto end;
} }
} }
if (EVP_PKEY_missing_parameters(from)) { if (EVP_PKEY_missing_parameters(from)) {
ERR_raise(ERR_LIB_EVP, EVP_R_MISSING_PARAMETERS); ERR_raise(ERR_LIB_EVP, EVP_R_MISSING_PARAMETERS);
goto err; goto end;
} }
if (!EVP_PKEY_missing_parameters(to)) { if (!EVP_PKEY_missing_parameters(to)) {
if (EVP_PKEY_parameters_eq(to, from) == 1) if (EVP_PKEY_parameters_eq(to, from) == 1)
return 1; ok = 1;
else
ERR_raise(ERR_LIB_EVP, EVP_R_DIFFERENT_PARAMETERS); ERR_raise(ERR_LIB_EVP, EVP_R_DIFFERENT_PARAMETERS);
return 0; goto end;
} }
/* For purely provided keys, we just call the keymgmt utility */ /* For purely provided keys, we just call the keymgmt utility */
if (to->keymgmt != NULL && from->keymgmt != NULL) if (to->keymgmt != NULL && from->keymgmt != NULL) {
return evp_keymgmt_util_copy(to, (EVP_PKEY *)from, SELECT_PARAMETERS); 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. * 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 * 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... * 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); ERR_raise(ERR_LIB_EVP, EVP_R_DIFFERENT_KEY_TYPES);
return 0; else
} ok = evp_keymgmt_copy(to->keymgmt, to->keydata, from_keydata,
return evp_keymgmt_copy(to->keymgmt, to->keydata, from_keydata,
SELECT_PARAMETERS); SELECT_PARAMETERS);
goto end;
} }
/* Both keys are legacy */ /* Both keys are legacy */
if (from->ameth != NULL && from->ameth->param_copy != NULL) if (from->ameth != NULL && from->ameth->param_copy != NULL)
return from->ameth->param_copy(to, from); ok = from->ameth->param_copy(to, from);
err: end:
return 0; EVP_PKEY_free(downgraded_from);
return ok;
} }
int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey) int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey)