diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-07-07 08:57:00 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-07-07 09:01:38 -0400 |
| commit | f65ff03d106f4cfe162bfde4780426b7bbc2e4ee (patch) | |
| tree | 571dd0bd95a0341fcb1817a3a17df69b1d43e3de /openssl/crypto/cmac | |
| parent | 4241d28e545a02eb753c8f713149e20747f044b6 (diff) | |
| download | vcxsrv-f65ff03d106f4cfe162bfde4780426b7bbc2e4ee.tar.gz vcxsrv-f65ff03d106f4cfe162bfde4780426b7bbc2e4ee.tar.bz2 vcxsrv-f65ff03d106f4cfe162bfde4780426b7bbc2e4ee.zip | |
Update openssl: 1.0.1m -> 1.0.1o
Diffstat (limited to 'openssl/crypto/cmac')
| -rw-r--r-- | openssl/crypto/cmac/Makefile | 2 | ||||
| -rw-r--r-- | openssl/crypto/cmac/cmac.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/openssl/crypto/cmac/Makefile b/openssl/crypto/cmac/Makefile index 54e7cc39d..6a2840867 100644 --- a/openssl/crypto/cmac/Makefile +++ b/openssl/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/openssl/crypto/cmac/cmac.c b/openssl/crypto/cmac/cmac.c index c5597a3f7..774e6dc91 100644 --- a/openssl/crypto/cmac/cmac.c +++ b/openssl/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); } |