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/dsa | |
| 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/dsa')
| -rw-r--r-- | crypto/dsa/dsa_ameth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c index 3fbec04..b72005a 100644 --- a/crypto/dsa/dsa_ameth.c +++ b/crypto/dsa/dsa_ameth.c @@ -211,7 +211,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey) unsigned char *dp = NULL; int dplen; - if (!pkey->pkey.dsa || !pkey->pkey.dsa->priv_key) { + if (pkey->pkey.dsa == NULL|| pkey->pkey.dsa->priv_key == NULL) { DSAerr(DSA_F_DSA_PRIV_ENCODE, DSA_R_MISSING_PARAMETERS); goto err; } @@ -233,7 +233,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey) /* Get private key into integer */ prkey = BN_to_ASN1_INTEGER(pkey->pkey.dsa->priv_key, NULL); - if (!prkey) { + if (prkey == NULL) { DSAerr(DSA_F_DSA_PRIV_ENCODE, DSA_R_BN_ERROR); goto err; } |