summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2024-01-30 17:43:39 +0000
committertb <>2024-01-30 17:43:39 +0000
commit6591873ca140c49434650ec8b1d34017955ca1db (patch)
treed1749448d2a9ca052e68ddcc65585f340fe2cfea
parent2fbdb4b0166f2045307f159118bab16fecbe9eaf (diff)
downloadopenbsd-6591873ca140c49434650ec8b1d34017955ca1db.tar.gz
openbsd-6591873ca140c49434650ec8b1d34017955ca1db.tar.bz2
openbsd-6591873ca140c49434650ec8b1d34017955ca1db.zip
Remove now unnecessary NULL check before EVP_CIPHER_CTX_cleanup()
-rw-r--r--src/lib/libcrypto/cmac/cmac.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libcrypto/cmac/cmac.c b/src/lib/libcrypto/cmac/cmac.c
index 86b1b2d5be..81d6ffc9b5 100644
--- a/src/lib/libcrypto/cmac/cmac.c
+++ b/src/lib/libcrypto/cmac/cmac.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cmac.c,v 1.21 2024/01/29 06:05:50 tb Exp $ */ 1/* $OpenBSD: cmac.c,v 1.22 2024/01/30 17:43:39 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -131,8 +131,7 @@ LCRYPTO_ALIAS(CMAC_CTX_new);
131void 131void
132CMAC_CTX_cleanup(CMAC_CTX *ctx) 132CMAC_CTX_cleanup(CMAC_CTX *ctx)
133{ 133{
134 if (ctx->cipher_ctx != NULL) 134 (void)EVP_CIPHER_CTX_reset(ctx->cipher_ctx);
135 (void)EVP_CIPHER_CTX_reset(ctx->cipher_ctx);
136 explicit_bzero(ctx->tbl, EVP_MAX_BLOCK_LENGTH); 135 explicit_bzero(ctx->tbl, EVP_MAX_BLOCK_LENGTH);
137 explicit_bzero(ctx->k1, EVP_MAX_BLOCK_LENGTH); 136 explicit_bzero(ctx->k1, EVP_MAX_BLOCK_LENGTH);
138 explicit_bzero(ctx->k2, EVP_MAX_BLOCK_LENGTH); 137 explicit_bzero(ctx->k2, EVP_MAX_BLOCK_LENGTH);