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

free NULL cleanup

Browse Source 
EVP_.*free; this gets:
        EVP_CIPHER_CTX_free EVP_PKEY_CTX_free EVP_PKEY_asn1_free
        EVP_PKEY_asn1_set_free EVP_PKEY_free EVP_PKEY_free_it
        EVP_PKEY_meth_free; and also EVP_CIPHER_CTX_cleanup

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
This commit is contained in:
Rich Salz 2015-03-28 10:54:15 -04:00
parent 33b188a8e8
commit c5ba2d9904
48 changed files with 90 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/dgst.c
View File

@ -384,8 +384,7 @@ int MAIN(int argc, char **argv)
} }
r = 1; r = 1;
mac_end: mac_end:
if (mac_ctx) EVP_PKEY_CTX_free(mac_ctx);
EVP_PKEY_CTX_free(mac_ctx);
if (r == 0) if (r == 0)
goto end; goto end;
} }

15
apps/genpkey.c
View File

@ -268,10 +268,8 @@ int MAIN(int argc, char **argv)
ret = 0; ret = 0;
end: end:
if (pkey) EVP_PKEY_free(pkey);
EVP_PKEY_free(pkey); EVP_PKEY_CTX_free(ctx);
if (ctx)
EVP_PKEY_CTX_free(ctx);
BIO_free_all(out); BIO_free_all(out);
BIO_free(in); BIO_free(in);
if (pass) if (pass)
@ -317,10 +315,8 @@ static int init_keygen_file(BIO *err, EVP_PKEY_CTX **pctx,
err: err:
BIO_puts(err, "Error initializing context\n"); BIO_puts(err, "Error initializing context\n");
ERR_print_errors(err); ERR_print_errors(err);
if (ctx) EVP_PKEY_CTX_free(ctx);
EVP_PKEY_CTX_free(ctx); EVP_PKEY_free(pkey);
if (pkey)
EVP_PKEY_free(pkey);
return 0; return 0;
} }
@ -375,8 +371,7 @@ int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
err: err:
BIO_printf(err, "Error initializing %s context\n", algname); BIO_printf(err, "Error initializing %s context\n", algname);
ERR_print_errors(err); ERR_print_errors(err);
if (ctx) EVP_PKEY_CTX_free(ctx);
EVP_PKEY_CTX_free(ctx);
return 0; return 0;
} }

3
apps/pkcs12.c
View File

@ -672,8 +672,7 @@ int MAIN(int argc, char **argv)
CRYPTO_push_info("process -export_cert: freeing"); CRYPTO_push_info("process -export_cert: freeing");
# endif # endif
if (key) EVP_PKEY_free(key);
EVP_PKEY_free(key);
if (certs) if (certs)
sk_X509_pop_free(certs, X509_free); sk_X509_pop_free(certs, X509_free);
if (ucert) if (ucert)

3
apps/pkeyutl.c
View File

@ -332,8 +332,7 @@ int MAIN(int argc, char **argv)
BIO_write(out, buf_out, buf_outlen); BIO_write(out, buf_out, buf_outlen);
end: end:
if (ctx) EVP_PKEY_CTX_free(ctx);
EVP_PKEY_CTX_free(ctx);
BIO_free(in); BIO_free(in);
BIO_free_all(out); BIO_free_all(out);
if (buf_in) if (buf_in)

5
apps/req.c
View File

@ -874,9 +874,9 @@ int MAIN(int argc, char **argv)
if (pkey == NULL) { if (pkey == NULL) {
pkey = X509_REQ_get_pubkey(req); pkey = X509_REQ_get_pubkey(req);
tmp = 1;
if (pkey == NULL) if (pkey == NULL)
goto end; goto end;
tmp = 1;
} }
i = X509_REQ_verify(req, pkey); i = X509_REQ_verify(req, pkey);
@ -1013,8 +1013,7 @@ int MAIN(int argc, char **argv)
BIO_free(in); BIO_free(in);
BIO_free_all(out); BIO_free_all(out);
EVP_PKEY_free(pkey); EVP_PKEY_free(pkey);
if (genctx) EVP_PKEY_CTX_free(genctx);
EVP_PKEY_CTX_free(genctx);
if (pkeyopts) if (pkeyopts)
sk_OPENSSL_STRING_free(pkeyopts); sk_OPENSSL_STRING_free(pkeyopts);
if (sigopts) if (sigopts)

3
apps/s_cb.c
View File

@ -1242,8 +1242,7 @@ void ssl_excert_free(SSL_EXCERT *exc)
while (exc) { while (exc) {
if (exc->cert) if (exc->cert)
X509_free(exc->cert); X509_free(exc->cert);
if (exc->key) EVP_PKEY_free(exc->key);
EVP_PKEY_free(exc->key);
if (exc->chain) if (exc->chain)
sk_X509_pop_free(exc->chain, X509_free); sk_X509_pop_free(exc->chain, X509_free);
curr = exc; curr = exc;

3
apps/s_client.c
View File

@ -2030,8 +2030,7 @@ int MAIN(int argc, char **argv)
X509_free(cert); X509_free(cert);
if (crls) if (crls)
sk_X509_CRL_pop_free(crls, X509_CRL_free); sk_X509_CRL_pop_free(crls, X509_CRL_free);
if (key) EVP_PKEY_free(key);
EVP_PKEY_free(key);
if (chain) if (chain)
sk_X509_pop_free(chain, X509_free); sk_X509_pop_free(chain, X509_free);
if (pass) if (pass)

9
apps/s_server.c
View File

@ -2011,10 +2011,8 @@ int MAIN(int argc, char *argv[])
sk_X509_CRL_pop_free(crls, X509_CRL_free); sk_X509_CRL_pop_free(crls, X509_CRL_free);
if (s_dcert) if (s_dcert)
X509_free(s_dcert); X509_free(s_dcert);
if (s_key) EVP_PKEY_free(s_key);
EVP_PKEY_free(s_key); EVP_PKEY_free(s_dkey);
if (s_dkey)
EVP_PKEY_free(s_dkey);
if (s_chain) if (s_chain)
sk_X509_pop_free(s_chain, X509_free); sk_X509_pop_free(s_chain, X509_free);
if (s_dchain) if (s_dchain)
@ -2037,8 +2035,7 @@ int MAIN(int argc, char *argv[])
SSL_CTX_free(ctx2); SSL_CTX_free(ctx2);
if (s_cert2) if (s_cert2)
X509_free(s_cert2); X509_free(s_cert2);
if (s_key2) EVP_PKEY_free(s_key2);
EVP_PKEY_free(s_key2);
BIO_free(serverinfo_in); BIO_free(serverinfo_in);
# ifndef OPENSSL_NO_NEXTPROTONEG # ifndef OPENSSL_NO_NEXTPROTONEG
if (next_proto.data) if (next_proto.data)

2
crypto/asn1/d2i_pr.c
View File

@ -113,7 +113,7 @@ EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
(*a) = ret; (*a) = ret;
return (ret); return (ret);
err: err:
if ((ret != NULL) && ((a == NULL) || (*a != ret))) if (a == NULL || *a != ret)
EVP_PKEY_free(ret); EVP_PKEY_free(ret);
return (NULL); return (NULL);
} }

2
crypto/asn1/d2i_pu.c
View File

@ -130,7 +130,7 @@ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
(*a) = ret; (*a) = ret;
return (ret); return (ret);
err: err:
if ((ret != NULL) && ((a == NULL) || (*a != ret))) if (a == NULL || *a != ret)
EVP_PKEY_free(ret); EVP_PKEY_free(ret);
return (NULL); return (NULL);
} }

3
crypto/asn1/x_pkey.c
View File

@ -144,8 +144,7 @@ void X509_PKEY_free(X509_PKEY *x)
if (x->enc_algor != NULL) if (x->enc_algor != NULL)
X509_ALGOR_free(x->enc_algor); X509_ALGOR_free(x->enc_algor);
ASN1_OCTET_STRING_free(x->enc_pkey); ASN1_OCTET_STRING_free(x->enc_pkey);
if (x->dec_pkey != NULL) EVP_PKEY_free(x->dec_pkey);
EVP_PKEY_free(x->dec_pkey);
if ((x->key_data != NULL) && (x->key_free)) if ((x->key_data != NULL) && (x->key_free))
OPENSSL_free(x->key_data); OPENSSL_free(x->key_data);
OPENSSL_free(x); OPENSSL_free(x);

3
crypto/asn1/x_pubkey.c
View File

@ -174,8 +174,7 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
return ret; return ret;
error: error:
if (ret != NULL) EVP_PKEY_free(ret);
EVP_PKEY_free(ret);
return (NULL); return (NULL);
} }

15
crypto/cms/cms_asn1.c
View File

@ -93,8 +93,7 @@ static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
{ {
if (operation == ASN1_OP_FREE_POST) { if (operation == ASN1_OP_FREE_POST) {
CMS_SignerInfo *si = (CMS_SignerInfo *)*pval; CMS_SignerInfo *si = (CMS_SignerInfo *)*pval;
if (si->pkey) EVP_PKEY_free(si->pkey);
EVP_PKEY_free(si->pkey);
if (si->signer) if (si->signer)
X509_free(si->signer); X509_free(si->signer);
if (si->pctx) if (si->pctx)
@ -171,8 +170,7 @@ static int cms_rek_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
{ {
CMS_RecipientEncryptedKey *rek = (CMS_RecipientEncryptedKey *)*pval; CMS_RecipientEncryptedKey *rek = (CMS_RecipientEncryptedKey *)*pval;
if (operation == ASN1_OP_FREE_POST) { if (operation == ASN1_OP_FREE_POST) {
if (rek->pkey) EVP_PKEY_free(rek->pkey);
EVP_PKEY_free(rek->pkey);
} }
return 1; return 1;
} }
@ -202,8 +200,7 @@ static int cms_kari_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
EVP_CIPHER_CTX_set_flags(&kari->ctx, EVP_CIPHER_CTX_FLAG_WRAP_ALLOW); EVP_CIPHER_CTX_set_flags(&kari->ctx, EVP_CIPHER_CTX_FLAG_WRAP_ALLOW);
kari->pctx = NULL; kari->pctx = NULL;
} else if (operation == ASN1_OP_FREE_POST) { } else if (operation == ASN1_OP_FREE_POST) {
if (kari->pctx) EVP_PKEY_CTX_free(kari->pctx);
EVP_PKEY_CTX_free(kari->pctx);
EVP_CIPHER_CTX_cleanup(&kari->ctx); EVP_CIPHER_CTX_cleanup(&kari->ctx);
} }
return 1; return 1;
@ -250,12 +247,10 @@ static int cms_ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
CMS_RecipientInfo *ri = (CMS_RecipientInfo *)*pval; CMS_RecipientInfo *ri = (CMS_RecipientInfo *)*pval;
if (ri->type == CMS_RECIPINFO_TRANS) { if (ri->type == CMS_RECIPINFO_TRANS) {
CMS_KeyTransRecipientInfo *ktri = ri->d.ktri; CMS_KeyTransRecipientInfo *ktri = ri->d.ktri;
if (ktri->pkey) EVP_PKEY_free(ktri->pkey);
EVP_PKEY_free(ktri->pkey);
if (ktri->recip) if (ktri->recip)
X509_free(ktri->recip); X509_free(ktri->recip);
if (ktri->pctx) EVP_PKEY_CTX_free(ktri->pctx);
EVP_PKEY_CTX_free(ktri->pctx);
} else if (ri->type == CMS_RECIPINFO_KEK) { } else if (ri->type == CMS_RECIPINFO_KEK) {
CMS_KEKRecipientInfo *kekri = ri->d.kekri; CMS_KEKRecipientInfo *kekri = ri->d.kekri;
if (kekri->key) { if (kekri->key) {

9
crypto/cms/cms_env.c
View File

@ -279,8 +279,7 @@ CMS_RecipientInfo *CMS_add1_recipient_cert(CMS_ContentInfo *cms,
err: err:
if (ri) if (ri)
M_ASN1_free_of(ri, CMS_RecipientInfo); M_ASN1_free_of(ri, CMS_RecipientInfo);
if (pk) EVP_PKEY_free(pk);
EVP_PKEY_free(pk);
return NULL; return NULL;
} }
@ -476,10 +475,8 @@ static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms,
ec->keylen = eklen; ec->keylen = eklen;
err: err:
if (ktri->pctx) { EVP_PKEY_CTX_free(ktri->pctx);
EVP_PKEY_CTX_free(ktri->pctx); ktri->pctx = NULL;
ktri->pctx = NULL;
}
if (!ret && ek) if (!ret && ek)
OPENSSL_free(ek); OPENSSL_free(ek);

8
crypto/cms/cms_kari.c
View File

@ -218,8 +218,7 @@ int CMS_RecipientInfo_kari_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pk)
kari->pctx = pctx; kari->pctx = pctx;
return 1; return 1;
err: err:
if (pctx) EVP_PKEY_CTX_free(pctx);
EVP_PKEY_CTX_free(pctx);
return 0; return 0;
} }
@ -331,10 +330,9 @@ static int cms_kari_create_ephemeral_key(CMS_KeyAgreeRecipientInfo *kari,
kari->pctx = pctx; kari->pctx = pctx;
rv = 1; rv = 1;
err: err:
if (!rv && pctx) if (!rv)
EVP_PKEY_CTX_free(pctx); EVP_PKEY_CTX_free(pctx);
if (ekey) EVP_PKEY_free(ekey);
EVP_PKEY_free(ekey);
return rv; return rv;
} }

9
crypto/cms/cms_sd.c
View File

@ -487,8 +487,7 @@ void CMS_SignerInfo_set1_signer_cert(CMS_SignerInfo *si, X509 *signer)
{ {
if (signer) { if (signer) {
CRYPTO_add(&signer->references, 1, CRYPTO_LOCK_X509); CRYPTO_add(&signer->references, 1, CRYPTO_LOCK_X509);
if (si->pkey) EVP_PKEY_free(si->pkey);
EVP_PKEY_free(si->pkey);
si->pkey = X509_get_pubkey(signer); si->pkey = X509_get_pubkey(signer);
} }
if (si->signer) if (si->signer)
@ -651,8 +650,7 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
err: err:
EVP_MD_CTX_cleanup(&mctx); EVP_MD_CTX_cleanup(&mctx);
if (pctx) EVP_PKEY_CTX_free(pctx);
EVP_PKEY_CTX_free(pctx);
return r; return r;
} }
@ -875,8 +873,7 @@ int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
} }
err: err:
if (pkctx) EVP_PKEY_CTX_free(pkctx);
EVP_PKEY_CTX_free(pkctx);
EVP_MD_CTX_cleanup(&mctx); EVP_MD_CTX_cleanup(&mctx);
return r; return r;

6
crypto/dh/dh_ameth.c
View File

@ -708,8 +708,7 @@ static int dh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
err: err:
if (public_key) if (public_key)
ASN1_INTEGER_free(public_key); ASN1_INTEGER_free(public_key);
if (pkpeer) EVP_PKEY_free(pkpeer);
EVP_PKEY_free(pkpeer);
DH_free(dhpeer); DH_free(dhpeer);
return rv; return rv;
} }
@ -849,8 +848,7 @@ static int dh_cms_encrypt(CMS_RecipientInfo *ri)
X509_ALGOR_get0(&aoid, NULL, NULL, talg); X509_ALGOR_get0(&aoid, NULL, NULL, talg);
/* Is everything uninitialised? */ /* Is everything uninitialised? */
if (aoid == OBJ_nid2obj(NID_undef)) { if (aoid == OBJ_nid2obj(NID_undef)) {
ASN1_INTEGER *pubk; ASN1_INTEGER *pubk = BN_to_ASN1_INTEGER(pkey->pkey.dh->pub_key, NULL);
pubk = BN_to_ASN1_INTEGER(pkey->pkey.dh->pub_key, NULL);
if (!pubk) if (!pubk)
goto err; goto err;
/* Set the key */ /* Set the key */

3
crypto/ec/ec_ameth.c
View File

@ -704,8 +704,7 @@ static int ecdh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
rv = 1; rv = 1;
err: err:
EC_KEY_free(ecpeer); EC_KEY_free(ecpeer);
if (pkpeer) EVP_PKEY_free(pkpeer);
EVP_PKEY_free(pkpeer);
return rv; return rv;
} }

3
crypto/evp/digest.c
View File

@ -352,8 +352,7 @@ int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx)
OPENSSL_cleanse(ctx->md_data, ctx->digest->ctx_size); OPENSSL_cleanse(ctx->md_data, ctx->digest->ctx_size);
OPENSSL_free(ctx->md_data); OPENSSL_free(ctx->md_data);
} }
if (ctx->pctx) EVP_PKEY_CTX_free(ctx->pctx);
EVP_PKEY_CTX_free(ctx->pctx);
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
if (ctx->engine) if (ctx->engine)
/* /*

7
crypto/evp/evp_enc.c
View File

@ -522,14 +522,15 @@ int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
{ {
if (ctx) { EVP_CIPHER_CTX_cleanup(ctx);
EVP_CIPHER_CTX_cleanup(ctx); if (ctx)
OPENSSL_free(ctx); OPENSSL_free(ctx);
}
} }
int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c) int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c)
{ {
if (!c)
return 0;
if (c->cipher != NULL) { if (c->cipher != NULL) {
if (c->cipher->cleanup && !c->cipher->cleanup(c)) if (c->cipher->cleanup && !c->cipher->cleanup(c))
return 0; return 0;

20
crypto/evp/evp_extra_test.c
View File

@ -265,9 +265,7 @@ static EVP_PKEY *load_example_rsa_key(void)
pkey = NULL; pkey = NULL;
out: out:
if (pkey) { EVP_PKEY_free(pkey);
EVP_PKEY_free(pkey);
}
RSA_free(rsa); RSA_free(rsa);
return ret; return ret;
@ -321,9 +319,7 @@ static int test_EVP_DigestSignInit(void)
EVP_MD_CTX_cleanup(&md_ctx); EVP_MD_CTX_cleanup(&md_ctx);
EVP_MD_CTX_cleanup(&md_ctx_verify); EVP_MD_CTX_cleanup(&md_ctx_verify);
if (pkey) { EVP_PKEY_free(pkey);
EVP_PKEY_free(pkey);
}
if (sig) { if (sig) {
OPENSSL_free(sig); OPENSSL_free(sig);
} }
@ -354,9 +350,7 @@ static int test_EVP_DigestVerifyInit(void)
} }
EVP_MD_CTX_cleanup(&md_ctx); EVP_MD_CTX_cleanup(&md_ctx);
if (pkey) { EVP_PKEY_free(pkey);
EVP_PKEY_free(pkey);
}
return ret; return ret;
} }
@ -387,9 +381,7 @@ static int test_d2i_AutoPrivateKey(const unsigned char *input,
ERR_print_errors_fp(stderr); ERR_print_errors_fp(stderr);
} }
if (pkey != NULL) { EVP_PKEY_free(pkey);
EVP_PKEY_free(pkey);
}
return ret; return ret;
} }
@ -422,9 +414,7 @@ static int test_EVP_PKCS82PKEY(void)
PKCS8_PRIV_KEY_INFO_free(p8inf); PKCS8_PRIV_KEY_INFO_free(p8inf);
} }
if (pkey != NULL) { EVP_PKEY_free(pkey);
EVP_PKEY_free(pkey);
}
return ret; return ret;
} }

9
crypto/evp/evp_test.c
View File

@ -1051,10 +1051,8 @@ static int mac_test_run(struct evp_test *t)
EVP_MD_CTX_destroy(mctx); EVP_MD_CTX_destroy(mctx);
if (mac) if (mac)
OPENSSL_free(mac); OPENSSL_free(mac);
if (genctx) EVP_PKEY_CTX_free(genctx);
EVP_PKEY_CTX_free(genctx); EVP_PKEY_free(key);
if (key)
EVP_PKEY_free(key);
t->err = err; t->err = err;
return 1; return 1;
} }
@ -1139,8 +1137,7 @@ static void pkey_test_cleanup(struct evp_test *t)
OPENSSL_free(kdata->input); OPENSSL_free(kdata->input);
if (kdata->output) if (kdata->output)
OPENSSL_free(kdata->output); OPENSSL_free(kdata->output);
if (kdata->ctx) EVP_PKEY_CTX_free(kdata->ctx);
EVP_PKEY_CTX_free(kdata->ctx);
} }
static int pkey_test_parse(struct evp_test *t, static int pkey_test_parse(struct evp_test *t,

1
crypto/evp/p_lib.c
View File

@ -409,6 +409,7 @@ void EVP_PKEY_free(EVP_PKEY *x)
static void EVP_PKEY_free_it(EVP_PKEY *x) static void EVP_PKEY_free_it(EVP_PKEY *x)
{ {
/* internal function; x is never NULL */
if (x->ameth && x->ameth->pkey_free) { if (x->ameth && x->ameth->pkey_free) {
x->ameth->pkey_free(x); x->ameth->pkey_free(x);
x->pkey.ptr = NULL; x->pkey.ptr = NULL;

3
crypto/evp/pmeth_fn.c
View File

@ -315,8 +315,7 @@ int EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer)
return -1; return -1;
} }
if (ctx->peerkey) EVP_PKEY_free(ctx->peerkey);
EVP_PKEY_free(ctx->peerkey);
ctx->peerkey = peer; ctx->peerkey = peer;
ret = ctx->pmeth->ctrl(ctx, EVP_PKEY_CTRL_PEER_KEY, 1, peer); ret = ctx->pmeth->ctrl(ctx, EVP_PKEY_CTRL_PEER_KEY, 1, peer);

3
crypto/evp/pmeth_gn.c
View File

@ -207,7 +207,6 @@ EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
if (EVP_PKEY_keygen(mac_ctx, &mac_key) <= 0) if (EVP_PKEY_keygen(mac_ctx, &mac_key) <= 0)
goto merr; goto merr;
merr: merr:
if (mac_ctx) EVP_PKEY_CTX_free(mac_ctx);
EVP_PKEY_CTX_free(mac_ctx);
return mac_key; return mac_key;
} }

6
crypto/evp/pmeth_lib.c
View File

@ -363,10 +363,8 @@ void EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx)
return; return;
if (ctx->pmeth && ctx->pmeth->cleanup) if (ctx->pmeth && ctx->pmeth->cleanup)
ctx->pmeth->cleanup(ctx); ctx->pmeth->cleanup(ctx);
if (ctx->pkey) EVP_PKEY_free(ctx->pkey);
EVP_PKEY_free(ctx->pkey); EVP_PKEY_free(ctx->peerkey);
if (ctx->peerkey)
EVP_PKEY_free(ctx->peerkey);
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
if (ctx->engine) if (ctx->engine)
/* /*

3
crypto/pem/pem_pk8.c
View File

@ -183,8 +183,7 @@ EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
if (!ret) if (!ret)
return NULL; return NULL;
if (x) { if (x) {
if (*x) EVP_PKEY_free(*x);
EVP_PKEY_free(*x);
*x = ret; *x = ret;
} }
return ret; return ret;

9
crypto/pem/pem_pkey.c
View File

@ -96,8 +96,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
goto p8err; goto p8err;
ret = EVP_PKCS82PKEY(p8inf); ret = EVP_PKCS82PKEY(p8inf);
if (x) { if (x) {
if (*x) EVP_PKEY_free((EVP_PKEY *)*x);
EVP_PKEY_free((EVP_PKEY *)*x);
*x = ret; *x = ret;
} }
PKCS8_PRIV_KEY_INFO_free(p8inf); PKCS8_PRIV_KEY_INFO_free(p8inf);
@ -124,8 +123,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
goto p8err; goto p8err;
ret = EVP_PKCS82PKEY(p8inf); ret = EVP_PKCS82PKEY(p8inf);
if (x) { if (x) {
if (*x) EVP_PKEY_free((EVP_PKEY *)*x);
EVP_PKEY_free((EVP_PKEY *)*x);
*x = ret; *x = ret;
} }
PKCS8_PRIV_KEY_INFO_free(p8inf); PKCS8_PRIV_KEY_INFO_free(p8inf);
@ -186,8 +184,7 @@ EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x)
goto err; goto err;
} }
if (x) { if (x) {
if (*x) EVP_PKEY_free((EVP_PKEY *)*x);
EVP_PKEY_free((EVP_PKEY *)*x);
*x = ret; *x = ret;
} }
} }

6
crypto/pem/pvkfmt.c
View File

@ -336,8 +336,7 @@ static EVP_PKEY *b2i_dss(const unsigned char **in, unsigned int length,
memerr: memerr:
PEMerr(PEM_F_B2I_DSS, ERR_R_MALLOC_FAILURE); PEMerr(PEM_F_B2I_DSS, ERR_R_MALLOC_FAILURE);
DSA_free(dsa); DSA_free(dsa);
if (ret) EVP_PKEY_free(ret);
EVP_PKEY_free(ret);
if (ctx) if (ctx)
BN_CTX_free(ctx); BN_CTX_free(ctx);
return NULL; return NULL;
@ -385,8 +384,7 @@ static EVP_PKEY *b2i_rsa(const unsigned char **in, unsigned int length,
memerr: memerr:
PEMerr(PEM_F_B2I_RSA, ERR_R_MALLOC_FAILURE); PEMerr(PEM_F_B2I_RSA, ERR_R_MALLOC_FAILURE);
RSA_free(rsa); RSA_free(rsa);
if (ret) EVP_PKEY_free(ret);
EVP_PKEY_free(ret);
return NULL; return NULL;
} }

2
crypto/pkcs12/p12_kiss.c
View File

@ -161,7 +161,7 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
err: err:
if (pkey && *pkey) if (pkey)
EVP_PKEY_free(*pkey); EVP_PKEY_free(*pkey);
if (cert && *cert) if (cert && *cert)
X509_free(*cert); X509_free(*cert);

13
crypto/pkcs7/pk7_doit.c
View File

@ -179,10 +179,8 @@ static int pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri,
ret = 1; ret = 1;
err: err:
if (pkey) EVP_PKEY_free(pkey);
EVP_PKEY_free(pkey); EVP_PKEY_CTX_free(pctx);
if (pctx)
EVP_PKEY_CTX_free(pctx);
if (ek) if (ek)
OPENSSL_free(ek); OPENSSL_free(ek);
return ret; return ret;
@ -240,8 +238,7 @@ static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
*peklen = eklen; *peklen = eklen;
err: err:
if (pctx) EVP_PKEY_CTX_free(pctx);
EVP_PKEY_CTX_free(pctx);
if (!ret && ek) if (!ret && ek)
OPENSSL_free(ek); OPENSSL_free(ek);
@ -1077,8 +1074,8 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, PKCS7_R_SIGNATURE_FAILURE); PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, PKCS7_R_SIGNATURE_FAILURE);
ret = -1; ret = -1;
goto err; goto err;
} else }
ret = 1; ret = 1;
err: err:
EVP_MD_CTX_cleanup(&mdc_tmp); EVP_MD_CTX_cleanup(&mdc_tmp);
return (ret); return (ret);

3
crypto/pkcs7/pk7_lib.c
View File

@ -556,8 +556,7 @@ int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
return 1; return 1;
err: err:
if (pkey) EVP_PKEY_free(pkey);
EVP_PKEY_free(pkey);
return 0; return 0;
} }

3
crypto/ts/ts_rsp_sign.c
View File

@ -216,8 +216,7 @@ int TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer)
int TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key) int TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key)
{ {
if (ctx->signer_key) EVP_PKEY_free(ctx->signer_key);
EVP_PKEY_free(ctx->signer_key);
ctx->signer_key = key; ctx->signer_key = key;
CRYPTO_add(&ctx->signer_key->references, +1, CRYPTO_LOCK_EVP_PKEY); CRYPTO_add(&ctx->signer_key->references, +1, CRYPTO_LOCK_EVP_PKEY);

6
crypto/x509/x509_cmp.c
View File

@ -342,8 +342,7 @@ int X509_check_private_key(X509 *x, EVP_PKEY *k)
case -2: case -2:
X509err(X509_F_X509_CHECK_PRIVATE_KEY, X509_R_UNKNOWN_KEY_TYPE); X509err(X509_F_X509_CHECK_PRIVATE_KEY, X509_R_UNKNOWN_KEY_TYPE);
} }
if (xk) EVP_PKEY_free(xk);
EVP_PKEY_free(xk);
if (ret > 0) if (ret > 0)
return 1; return 1;
return 0; return 0;
@ -436,8 +435,7 @@ int X509_chain_check_suiteb(int *perror_depth, X509 *x, STACK_OF(X509) *chain,
/* Final check: root CA signature */ /* Final check: root CA signature */
rv = check_suite_b(pk, X509_get_signature_nid(x), &tflags); rv = check_suite_b(pk, X509_get_signature_nid(x), &tflags);
end: end:
if (pk) EVP_PKEY_free(pk);
EVP_PKEY_free(pk);
if (rv != X509_V_OK) { if (rv != X509_V_OK) {
/* Invalid signature or LOS errors are for previous cert */ /* Invalid signature or LOS errors are for previous cert */
if ((rv == X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM if ((rv == X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM

6
crypto/x509/x509_vfy.c
View File

@ -1933,10 +1933,8 @@ int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain)
} }
if (!EVP_PKEY_missing_parameters(ktmp)) if (!EVP_PKEY_missing_parameters(ktmp))
break; break;
else { EVP_PKEY_free(ktmp);
EVP_PKEY_free(ktmp); ktmp = NULL;
ktmp = NULL;
}
} }
if (ktmp == NULL) { if (ktmp == NULL) {
X509err(X509_F_X509_GET_PUBKEY_PARAMETERS, X509err(X509_F_X509_GET_PUBKEY_PARAMETERS,

3
demos/cms/cms_ddec.c
View File

@ -72,8 +72,7 @@ int main(int argc, char **argv)
CMS_ContentInfo_free(cms); CMS_ContentInfo_free(cms);
if (rcert) if (rcert)
X509_free(rcert); X509_free(rcert);
if (rkey) EVP_PKEY_free(rkey);
EVP_PKEY_free(rkey);
BIO_free(in); BIO_free(in);
BIO_free(out); BIO_free(out);

3
demos/cms/cms_dec.c
View File

@ -63,8 +63,7 @@ int main(int argc, char **argv)
CMS_ContentInfo_free(cms); CMS_ContentInfo_free(cms);
if (rcert) if (rcert)
X509_free(rcert); X509_free(rcert);
if (rkey) EVP_PKEY_free(rkey);
EVP_PKEY_free(rkey);
BIO_free(in); BIO_free(in);
BIO_free(out); BIO_free(out);

3
demos/cms/cms_sign.c
View File

@ -73,8 +73,7 @@ int main(int argc, char **argv)
CMS_ContentInfo_free(cms); CMS_ContentInfo_free(cms);
if (scert) if (scert)
X509_free(scert); X509_free(scert);
if (skey) EVP_PKEY_free(skey);
EVP_PKEY_free(skey);
BIO_free(in); BIO_free(in);
BIO_free(out); BIO_free(out);

6
demos/cms/cms_sign2.c
View File

@ -82,13 +82,11 @@ int main(int argc, char **argv)
if (scert) if (scert)
X509_free(scert); X509_free(scert);
if (skey) EVP_PKEY_free(skey);
EVP_PKEY_free(skey);
if (scert2) if (scert2)
X509_free(scert2); X509_free(scert2);
if (skey) EVP_PKEY_free(skey2);
EVP_PKEY_free(skey2);
BIO_free(in); BIO_free(in);
BIO_free(out); BIO_free(out);

3
demos/smime/smdec.c
View File

@ -63,8 +63,7 @@ int main(int argc, char **argv)
PKCS7_free(p7); PKCS7_free(p7);
if (rcert) if (rcert)
X509_free(rcert); X509_free(rcert);
if (rkey) EVP_PKEY_free(rkey);
EVP_PKEY_free(rkey);
BIO_free(in); BIO_free(in);
BIO_free(out); BIO_free(out);

3
demos/smime/smsign.c
View File

@ -73,8 +73,7 @@ int main(int argc, char **argv)
PKCS7_free(p7); PKCS7_free(p7);
if (scert) if (scert)
X509_free(scert); X509_free(scert);
if (skey) EVP_PKEY_free(skey);
EVP_PKEY_free(skey);
BIO_free(in); BIO_free(in);
BIO_free(out); BIO_free(out);

6
demos/smime/smsign2.c
View File

@ -82,13 +82,11 @@ int main(int argc, char **argv)
if (scert) if (scert)
X509_free(scert); X509_free(scert);
if (skey) EVP_PKEY_free(skey);
EVP_PKEY_free(skey);
if (scert2) if (scert2)
X509_free(scert2); X509_free(scert2);
if (skey) EVP_PKEY_free(skey2);
EVP_PKEY_free(skey2);
BIO_free(in); BIO_free(in);
BIO_free(out); BIO_free(out);

1
doc/crypto/EVP_PKEY_CTX_new.pod
View File

@ -26,6 +26,7 @@ during parameter generation of key genration for some algorithms.
EVP_PKEY_CTX_dup() duplicates the context B<ctx>. EVP_PKEY_CTX_dup() duplicates the context B<ctx>.
EVP_PKEY_CTX_free() frees up the context B<ctx>. EVP_PKEY_CTX_free() frees up the context B<ctx>.
If B<ctx> is NULL, nothing is done.
=head1 NOTES =head1 NOTES

1
doc/crypto/EVP_PKEY_new.pod
View File

@ -18,6 +18,7 @@ The EVP_PKEY_new() function allocates an empty B<EVP_PKEY>
structure which is used by OpenSSL to store private keys. structure which is used by OpenSSL to store private keys.
EVP_PKEY_free() frees up the private key B<key>. EVP_PKEY_free() frees up the private key B<key>.
If B<key> is NULL, nothing is done.
=head1 NOTES =head1 NOTES

7
engines/ccgost/gost2001_keyx.c
View File

@ -189,7 +189,7 @@ int pkey_GOST01cp_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out,
} }
ASN1_OBJECT_free(gkt->key_agreement_info->cipher); ASN1_OBJECT_free(gkt->key_agreement_info->cipher);
gkt->key_agreement_info->cipher = OBJ_nid2obj(param->nid); gkt->key_agreement_info->cipher = OBJ_nid2obj(param->nid);
if (key_is_ephemeral && sec_key) if (key_is_ephemeral)
EVP_PKEY_free(sec_key); EVP_PKEY_free(sec_key);
if (!key_is_ephemeral) { if (!key_is_ephemeral) {
/* Set control "public key from client certificate used" */ /* Set control "public key from client certificate used" */
@ -204,7 +204,7 @@ int pkey_GOST01cp_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out,
GOST_KEY_TRANSPORT_free(gkt); GOST_KEY_TRANSPORT_free(gkt);
return ret; return ret;
err: err:
if (key_is_ephemeral && sec_key) if (key_is_ephemeral)
EVP_PKEY_free(sec_key); EVP_PKEY_free(sec_key);
GOST_KEY_TRANSPORT_free(gkt); GOST_KEY_TRANSPORT_free(gkt);
return -1; return -1;
@ -284,8 +284,7 @@ int pkey_GOST01cp_decrypt(EVP_PKEY_CTX *pctx, unsigned char *key,
ret = 1; ret = 1;
err: err:
if (eph_key) EVP_PKEY_free(eph_key);
EVP_PKEY_free(eph_key);
if (gkt) if (gkt)
GOST_KEY_TRANSPORT_free(gkt); GOST_KEY_TRANSPORT_free(gkt);
return ret; return ret;

3
engines/e_chil.c
View File

@ -887,8 +887,7 @@ static EVP_PKEY *hwcrhk_load_pubkey(ENGINE *eng, const char *key_id,
return res; return res;
err: err:
if (res) EVP_PKEY_free(res);
EVP_PKEY_free(res);
return NULL; return NULL;
} }

3
ssl/s3_srvr.c
View File

@ -2869,8 +2869,7 @@ int ssl3_get_client_key_exchange(SSL *s)
EVP_PKEY_CTX_free(pkey_ctx); EVP_PKEY_CTX_free(pkey_ctx);
if (ret) if (ret)
return ret; return ret;
else goto err;
goto err;
} else { } else {
al = SSL_AD_HANDSHAKE_FAILURE; al = SSL_AD_HANDSHAKE_FAILURE;
SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_UNKNOWN_CIPHER_TYPE); SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_UNKNOWN_CIPHER_TYPE);

6
ssl/ssl_cert.c
View File

@ -402,10 +402,8 @@ void ssl_cert_clear_certs(CERT *c)
X509_free(cpk->x509); X509_free(cpk->x509);
cpk->x509 = NULL; cpk->x509 = NULL;
} }
if (cpk->privatekey) { EVP_PKEY_free(cpk->privatekey);
EVP_PKEY_free(cpk->privatekey); cpk->privatekey = NULL;
cpk->privatekey = NULL;
}
if (cpk->chain) { if (cpk->chain) {
sk_X509_pop_free(cpk->chain, X509_free); sk_X509_pop_free(cpk->chain, X509_free);
cpk->chain = NULL; cpk->chain = NULL;