From 90945fa31a42dcf3beb90540c618e4d627c595ea Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Fri, 30 Oct 2015 11:12:26 +0000 Subject: Continue standardising malloc style for libcrypto Continuing from previous commit ensure our style is consistent for malloc return checks. Reviewed-by: Kurt Roeckx --- crypto/cmac/cm_pmeth.c | 4 ++-- crypto/cmac/cmac.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'crypto/cmac') diff --git a/crypto/cmac/cm_pmeth.c b/crypto/cmac/cm_pmeth.c index 22c7dbee06..080db6329e 100644 --- a/crypto/cmac/cm_pmeth.c +++ b/crypto/cmac/cm_pmeth.c @@ -64,7 +64,7 @@ static int pkey_cmac_init(EVP_PKEY_CTX *ctx) { ctx->data = CMAC_CTX_new(); - if (!ctx->data) + if (ctx->data == NULL) return 0; ctx->keygen_info_count = 0; return 1; @@ -88,7 +88,7 @@ static int pkey_cmac_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey) { CMAC_CTX *cmkey = CMAC_CTX_new(); CMAC_CTX *cmctx = ctx->data; - if (!cmkey) + if (cmkey == NULL) return 0; if (!CMAC_CTX_copy(cmkey, cmctx)) { CMAC_CTX_free(cmkey); diff --git a/crypto/cmac/cmac.c b/crypto/cmac/cmac.c index 0711bffd8a..fc9e761266 100644 --- a/crypto/cmac/cmac.c +++ b/crypto/cmac/cmac.c @@ -92,7 +92,7 @@ CMAC_CTX *CMAC_CTX_new(void) CMAC_CTX *ctx; ctx = OPENSSL_malloc(sizeof(*ctx)); - if (!ctx) + if (ctx == NULL) return NULL; EVP_CIPHER_CTX_init(&ctx->cctx); ctx->nlast_block = -1; -- cgit v1.2.3