diff options
| author | Matt Caswell <matt@openssl.org> | 2015-10-30 11:12:26 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-11-09 22:48:41 +0000 |
| commit | 90945fa31a42dcf3beb90540c618e4d627c595ea (patch) | |
| tree | e73870c253abf0c37ca618384e30a7937a996b55 /crypto/hmac | |
| parent | a71edf3ba275b946224b5bcded0a8ecfce1855c0 (diff) | |
Continue standardising malloc style for libcrypto
Continuing from previous commit ensure our style is consistent for malloc
return checks.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'crypto/hmac')
| -rw-r--r-- | crypto/hmac/hm_ameth.c | 2 | ||||
| -rw-r--r-- | crypto/hmac/hm_pmeth.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/hmac/hm_ameth.c b/crypto/hmac/hm_ameth.c index 20abe4f087..df6bf0b3ef 100644 --- a/crypto/hmac/hm_ameth.c +++ b/crypto/hmac/hm_ameth.c @@ -107,7 +107,7 @@ static int old_hmac_decode(EVP_PKEY *pkey, { ASN1_OCTET_STRING *os; os = ASN1_OCTET_STRING_new(); - if (!os || !ASN1_OCTET_STRING_set(os, *pder, derlen)) + if (os == NULL || !ASN1_OCTET_STRING_set(os, *pder, derlen)) goto err; if (!EVP_PKEY_assign(pkey, EVP_PKEY_HMAC, os)) goto err; diff --git a/crypto/hmac/hm_pmeth.c b/crypto/hmac/hm_pmeth.c index ff9dbe35b0..e06a1db0ea 100644 --- a/crypto/hmac/hm_pmeth.c +++ b/crypto/hmac/hm_pmeth.c @@ -77,7 +77,7 @@ static int pkey_hmac_init(EVP_PKEY_CTX *ctx) HMAC_PKEY_CTX *hctx; hctx = OPENSSL_zalloc(sizeof(*hctx)); - if (!hctx) + if (hctx == NULL) return 0; hctx->ktmp.type = V_ASN1_OCTET_STRING; HMAC_CTX_init(&hctx->ctx); |