diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-05-06 13:43:59 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-05-11 10:06:38 -0400 |
| commit | 75ebbd9aa411c5b8b19ded6ace2b34181566b56a (patch) | |
| tree | 6bc9cd77b2794b25f9cd9aac1c66f4626fb975a5 /crypto/pkcs12/p12_decr.c | |
| parent | 344c271eb339fc2982e9a3584a94e51112d84584 (diff) | |
| download | openssl-new-75ebbd9aa411c5b8b19ded6ace2b34181566b56a.tar.gz | |
Use p==NULL not !p (in if statements, mainly)
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/pkcs12/p12_decr.c')
| -rw-r--r-- | crypto/pkcs12/p12_decr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c index 19efd967d8..5154e545fe 100644 --- a/crypto/pkcs12/p12_decr.c +++ b/crypto/pkcs12/p12_decr.c @@ -88,7 +88,8 @@ unsigned char *PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass, return NULL; } - if (!(out = OPENSSL_malloc(inlen + EVP_CIPHER_CTX_block_size(&ctx)))) { + if ((out = OPENSSL_malloc(inlen + EVP_CIPHER_CTX_block_size(&ctx))) + == NULL) { PKCS12err(PKCS12_F_PKCS12_PBE_CRYPT, ERR_R_MALLOC_FAILURE); goto err; } @@ -174,7 +175,8 @@ ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor, ASN1_OCTET_STRING *oct = NULL; unsigned char *in = NULL; int inlen; - if (!(oct = ASN1_OCTET_STRING_new())) { + + if ((oct = ASN1_OCTET_STRING_new()) == NULL) { PKCS12err(PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT, ERR_R_MALLOC_FAILURE); goto err; } |