From 72036bf4bbef02536427f2044486d9b6d6e2e355 Mon Sep 17 00:00:00 2001 From: inoguchi <> Date: Fri, 30 Aug 2019 12:32:14 +0000 Subject: Remove unnecessary NULL check before free function in openssl(1) dgst --- src/usr.bin/openssl/dgst.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/usr.bin/openssl/dgst.c b/src/usr.bin/openssl/dgst.c index 4f71634dbe..74c31f7d2d 100644 --- a/src/usr.bin/openssl/dgst.c +++ b/src/usr.bin/openssl/dgst.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dgst.c,v 1.17 2019/08/30 12:09:05 inoguchi Exp $ */ +/* $OpenBSD: dgst.c,v 1.18 2019/08/30 12:32:14 inoguchi Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -462,8 +462,7 @@ dgst_main(int argc, char **argv) } r = 1; mac_end: - if (mac_ctx) - EVP_PKEY_CTX_free(mac_ctx); + EVP_PKEY_CTX_free(mac_ctx); if (r == 0) goto end; } @@ -589,18 +588,14 @@ dgst_main(int argc, char **argv) end: freezero(buf, BUFSIZE); - if (in != NULL) - BIO_free(in); + BIO_free(in); free(passin); BIO_free_all(out); EVP_PKEY_free(sigkey); - if (dgst_config.sigopts) - sk_OPENSSL_STRING_free(dgst_config.sigopts); - if (dgst_config.macopts) - sk_OPENSSL_STRING_free(dgst_config.macopts); + sk_OPENSSL_STRING_free(dgst_config.sigopts); + sk_OPENSSL_STRING_free(dgst_config.macopts); free(sigbuf); - if (bmd != NULL) - BIO_free(bmd); + BIO_free(bmd); return (err); } -- cgit v1.2.3-55-g6feb