Skip to content

Commit c5ba2d9

Browse files
author
Rich Salz
committed
free NULL cleanup
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 <[email protected]>
1 parent 33b188a commit c5ba2d9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+90
-165
lines changed

‎apps/dgst.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,7 @@ int MAIN(int argc, char **argv)
384384
}
385385
r = 1;
386386
mac_end:
387-
if (mac_ctx)
388-
EVP_PKEY_CTX_free(mac_ctx);
387+
EVP_PKEY_CTX_free(mac_ctx);
389388
if (r == 0)
390389
goto end;
391390
}

‎apps/genpkey.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,8 @@ int MAIN(int argc, char **argv)
268268
ret = 0;
269269

270270
end:
271-
if (pkey)
272-
EVP_PKEY_free(pkey);
273-
if (ctx)
274-
EVP_PKEY_CTX_free(ctx);
271+
EVP_PKEY_free(pkey);
272+
EVP_PKEY_CTX_free(ctx);
275273
BIO_free_all(out);
276274
BIO_free(in);
277275
if (pass)
@@ -317,10 +315,8 @@ static int init_keygen_file(BIO *err, EVP_PKEY_CTX **pctx,
317315
err:
318316
BIO_puts(err, "Error initializing context\n");
319317
ERR_print_errors(err);
320-
if (ctx)
321-
EVP_PKEY_CTX_free(ctx);
322-
if (pkey)
323-
EVP_PKEY_free(pkey);
318+
EVP_PKEY_CTX_free(ctx);
319+
EVP_PKEY_free(pkey);
324320
return 0;
325321

326322
}
@@ -375,8 +371,7 @@ int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
375371
err:
376372
BIO_printf(err, "Error initializing %s context\n", algname);
377373
ERR_print_errors(err);
378-
if (ctx)
379-
EVP_PKEY_CTX_free(ctx);
374+
EVP_PKEY_CTX_free(ctx);
380375
return 0;
381376

382377
}

‎apps/pkcs12.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,8 +672,7 @@ int MAIN(int argc, char **argv)
672672
CRYPTO_push_info("process -export_cert: freeing");
673673
# endif
674674

675-
if (key)
676-
EVP_PKEY_free(key);
675+
EVP_PKEY_free(key);
677676
if (certs)
678677
sk_X509_pop_free(certs, X509_free);
679678
if (ucert)

‎apps/pkeyutl.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,7 @@ int MAIN(int argc, char **argv)
332332
BIO_write(out, buf_out, buf_outlen);
333333

334334
end:
335-
if (ctx)
336-
EVP_PKEY_CTX_free(ctx);
335+
EVP_PKEY_CTX_free(ctx);
337336
BIO_free(in);
338337
BIO_free_all(out);
339338
if (buf_in)

‎apps/req.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -874,9 +874,9 @@ int MAIN(int argc, char **argv)
874874

875875
if (pkey == NULL) {
876876
pkey = X509_REQ_get_pubkey(req);
877-
tmp = 1;
878877
if (pkey == NULL)
879878
goto end;
879+
tmp = 1;
880880
}
881881

882882
i = X509_REQ_verify(req, pkey);
@@ -1013,8 +1013,7 @@ int MAIN(int argc, char **argv)
10131013
BIO_free(in);
10141014
BIO_free_all(out);
10151015
EVP_PKEY_free(pkey);
1016-
if (genctx)
1017-
EVP_PKEY_CTX_free(genctx);
1016+
EVP_PKEY_CTX_free(genctx);
10181017
if (pkeyopts)
10191018
sk_OPENSSL_STRING_free(pkeyopts);
10201019
if (sigopts)

‎apps/s_cb.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,8 +1242,7 @@ void ssl_excert_free(SSL_EXCERT *exc)
12421242
while (exc) {
12431243
if (exc->cert)
12441244
X509_free(exc->cert);
1245-
if (exc->key)
1246-
EVP_PKEY_free(exc->key);
1245+
EVP_PKEY_free(exc->key);
12471246
if (exc->chain)
12481247
sk_X509_pop_free(exc->chain, X509_free);
12491248
curr = exc;

‎apps/s_client.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2030,8 +2030,7 @@ int MAIN(int argc, char **argv)
20302030
X509_free(cert);
20312031
if (crls)
20322032
sk_X509_CRL_pop_free(crls, X509_CRL_free);
2033-
if (key)
2034-
EVP_PKEY_free(key);
2033+
EVP_PKEY_free(key);
20352034
if (chain)
20362035
sk_X509_pop_free(chain, X509_free);
20372036
if (pass)

‎apps/s_server.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2011,10 +2011,8 @@ int MAIN(int argc, char *argv[])
20112011
sk_X509_CRL_pop_free(crls, X509_CRL_free);
20122012
if (s_dcert)
20132013
X509_free(s_dcert);
2014-
if (s_key)
2015-
EVP_PKEY_free(s_key);
2016-
if (s_dkey)
2017-
EVP_PKEY_free(s_dkey);
2014+
EVP_PKEY_free(s_key);
2015+
EVP_PKEY_free(s_dkey);
20182016
if (s_chain)
20192017
sk_X509_pop_free(s_chain, X509_free);
20202018
if (s_dchain)
@@ -2037,8 +2035,7 @@ int MAIN(int argc, char *argv[])
20372035
SSL_CTX_free(ctx2);
20382036
if (s_cert2)
20392037
X509_free(s_cert2);
2040-
if (s_key2)
2041-
EVP_PKEY_free(s_key2);
2038+
EVP_PKEY_free(s_key2);
20422039
BIO_free(serverinfo_in);
20432040
# ifndef OPENSSL_NO_NEXTPROTONEG
20442041
if (next_proto.data)

‎crypto/asn1/d2i_pr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
113113
(*a) = ret;
114114
return (ret);
115115
err:
116-
if ((ret != NULL) && ((a == NULL) || (*a != ret)))
116+
if (a == NULL || *a != ret)
117117
EVP_PKEY_free(ret);
118118
return (NULL);
119119
}

‎crypto/asn1/d2i_pu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
130130
(*a) = ret;
131131
return (ret);
132132
err:
133-
if ((ret != NULL) && ((a == NULL) || (*a != ret)))
133+
if (a == NULL || *a != ret)
134134
EVP_PKEY_free(ret);
135135
return (NULL);
136136
}

0 commit comments

Comments
 (0)