aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/cmac
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2015-06-11 17:56:16 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2015-06-11 17:56:16 +0000
commita9745f9a849725cad34f84351bed202839aade59 (patch)
tree686ec4279139441a2f9d947dceec492e54ff569c /crypto/cmac
parent3d2030852da420b820a661e7b19bb757487e2599 (diff)
downloadsrc-a9745f9a849725cad34f84351bed202839aade59.tar.gz
src-a9745f9a849725cad34f84351bed202839aade59.zip
Import OpenSSL 1.0.1n.vendor/openssl/1.0.1n
Notes
Notes: svn path=/vendor-crypto/openssl/dist/; revision=284278 svn path=/vendor-crypto/openssl/1.0.1n/; revision=284279; tag=vendor/openssl/1.0.1n
Diffstat (limited to 'crypto/cmac')
-rw-r--r--crypto/cmac/Makefile2
-rw-r--r--crypto/cmac/cmac.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/crypto/cmac/Makefile b/crypto/cmac/Makefile
index 54e7cc39d52b..6a2840867643 100644
--- a/crypto/cmac/Makefile
+++ b/crypto/cmac/Makefile
@@ -61,6 +61,8 @@ tests:
lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
+update: depend
+
depend:
@[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
diff --git a/crypto/cmac/cmac.c b/crypto/cmac/cmac.c
index c5597a3f73b9..774e6dc91905 100644
--- a/crypto/cmac/cmac.c
+++ b/crypto/cmac/cmac.c
@@ -126,6 +126,8 @@ EVP_CIPHER_CTX *CMAC_CTX_get0_cipher_ctx(CMAC_CTX *ctx)
void CMAC_CTX_free(CMAC_CTX *ctx)
{
+ if (!ctx)
+ return;
CMAC_CTX_cleanup(ctx);
OPENSSL_free(ctx);
}