generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Extend EVP_PKEY_copy_parameters()

Browse Source 
Make EVP_PKEY_copy_parameters() work if the destination has no type
(e.g. if obtained from EVP_PKEY_new()) or the underlying key is NULL.
This is useful where we want to copy the parameters from an existing
key to a new key.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
This commit is contained in:
Dr. Stephen Henson
2015-12-13 17:28:40 +00:00
parent d911097d7c
commit 2986ecdc08
4 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/evp/p_lib.c
View File

@@ -129,7 +129,10 @@ int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
{
if (to->type != from->type) {
if (to->type == EVP_PKEY_NONE) {
if (EVP_PKEY_set_type(to, from->type) == 0)
return 0;
} else if (to->type != from->type) {
EVPerr(EVP_F_EVP_PKEY_COPY_PARAMETERS, EVP_R_DIFFERENT_KEY_TYPES);
goto err;
}