From be62ec7782f11e6015eaa953859a4ea240c4ed8b Mon Sep 17 00:00:00 2001
From: miod <>
Date: Sat, 12 Jul 2014 14:58:32 +0000
Subject: Principle of least surprise: make CMAC_CTX_free(),
 OCSP_REQ_CTX_free() and X509_STORE_CTX_free() accept NULL pointers as input
 without dereferencing them, like all the other well-behaved *_CTX_free()
 functions do.

---
 src/lib/libcrypto/cmac/cmac.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/cmac')

diff --git a/src/lib/libcrypto/cmac/cmac.c b/src/lib/libcrypto/cmac/cmac.c
index baba674ec1..18635b942a 100644
--- a/src/lib/libcrypto/cmac/cmac.c
+++ b/src/lib/libcrypto/cmac/cmac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmac.c,v 1.8 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: cmac.c,v 1.9 2014/07/12 14:58:32 miod Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -123,6 +123,9 @@ CMAC_CTX_get0_cipher_ctx(CMAC_CTX *ctx)
 void
 CMAC_CTX_free(CMAC_CTX *ctx)
 {
+	if (ctx == NULL)
+		return;
+
 	CMAC_CTX_cleanup(ctx);
 	free(ctx);
 }
-- 
cgit v1.2.3-55-g6feb