wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

clear out PKEY when setting new key

Browse Source
This commit is contained in:
JacobBarthelmeh
2022-06-23 14:21:53 -07:00
parent cd2c7e1438
commit 4de90efbe2
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wolfcrypt/src/evp.c
View File

@@ -7410,15 +7410,21 @@ void* wolfSSL_EVP_X_STATE(const WOLFSSL_EVP_CIPHER_CTX* ctx)
} }
int wolfSSL_EVP_PKEY_assign_EC_KEY(EVP_PKEY* pkey, WOLFSSL_EC_KEY* key) int wolfSSL_EVP_PKEY_assign_EC_KEY(EVP_PKEY* pkey, WOLFSSL_EC_KEY* key)
{ {
int ret;
if (pkey == NULL || key == NULL) if (pkey == NULL || key == NULL)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
pkey->type = EVP_PKEY_EC;
pkey->ecc = key;
pkey->ownEcc = 1;
/* try and populate public pkey_sz and pkey.ptr */ /* try and populate public pkey_sz and pkey.ptr */
return ECC_populate_EVP_PKEY(pkey, key); ret = ECC_populate_EVP_PKEY(pkey, key);
if (ret == WOLFSSL_SUCCESS) { /* take ownership of key if can be used */
clearEVPPkeyKeys(pkey); /* clear out any previous keys */
pkey->type = EVP_PKEY_EC;
pkey->ecc = key;
pkey->ownEcc = 1;
}
return ret;
} }
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
@@ -7905,6 +7911,7 @@ int wolfSSL_EVP_PKEY_assign_RSA(EVP_PKEY* pkey, WOLFSSL_RSA* key)
if (pkey == NULL || key == NULL) if (pkey == NULL || key == NULL)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
clearEVPPkeyKeys(pkey);
pkey->type = EVP_PKEY_RSA; pkey->type = EVP_PKEY_RSA;
pkey->rsa = key; pkey->rsa = key;
pkey->ownRsa = 1; pkey->ownRsa = 1;
@@ -7940,6 +7947,7 @@ int wolfSSL_EVP_PKEY_assign_DSA(EVP_PKEY* pkey, WOLFSSL_DSA* key)
if (pkey == NULL || key == NULL) if (pkey == NULL || key == NULL)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
clearEVPPkeyKeys(pkey);
pkey->type = EVP_PKEY_DSA; pkey->type = EVP_PKEY_DSA;
pkey->dsa = key; pkey->dsa = key;
pkey->ownDsa = 1; pkey->ownDsa = 1;
@@ -7954,6 +7962,7 @@ int wolfSSL_EVP_PKEY_assign_DH(EVP_PKEY* pkey, WOLFSSL_DH* key)
if (pkey == NULL || key == NULL) if (pkey == NULL || key == NULL)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
clearEVPPkeyKeys(pkey);
pkey->type = EVP_PKEY_DH; pkey->type = EVP_PKEY_DH;
pkey->dh = key; pkey->dh = key;
pkey->ownDh = 1; pkey->ownDh = 1;