diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-09-16 15:28:57 -0400 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-10-09 21:32:15 +0200 |
| commit | 12a765a5235f181c2f4992b615eb5f892c368e88 (patch) | |
| tree | 67ece1a3fb210bd4895aea73649773fc912a60d6 /crypto/asn1/p5_pbev2.c | |
| parent | 3a4e43de473ee80347036d78163889b6b1221210 (diff) | |
| download | openssl-12a765a5235f181c2f4992b615eb5f892c368e88.zip openssl-12a765a5235f181c2f4992b615eb5f892c368e88.tar.gz openssl-12a765a5235f181c2f4992b615eb5f892c368e88.tar.bz2 | |
Explicitly test against NULL; do not use !p or similar
Also added blanks lines after declarations in a couple of places.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9916)
Diffstat (limited to 'crypto/asn1/p5_pbev2.c')
| -rw-r--r-- | crypto/asn1/p5_pbev2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c index 49298f3..f7f5f46 100644 --- a/crypto/asn1/p5_pbev2.c +++ b/crypto/asn1/p5_pbev2.c @@ -107,7 +107,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, pbe2->keyfunc = PKCS5_pbkdf2_set(iter, salt, saltlen, prf_nid, keylen); - if (!pbe2->keyfunc) + if (pbe2->keyfunc == NULL) goto merr; /* Now set up top level AlgorithmIdentifier */ |