From 12a765a5235f181c2f4992b615eb5f892c368e88 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Mon, 16 Sep 2019 15:28:57 -0400 Subject: 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 Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9916) --- engines/e_capi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'engines') diff --git a/engines/e_capi.c b/engines/e_capi.c index c3a8306ab1..74b79e31c6 100644 --- a/engines/e_capi.c +++ b/engines/e_capi.c @@ -1301,13 +1301,14 @@ static void capi_dump_prov_info(CAPI_CTX *ctx, BIO *out, CRYPT_KEY_PROV_INFO *pinfo) { char *provname = NULL, *contname = NULL; - if (!pinfo) { + + if (pinfo == NULL) { BIO_printf(out, " No Private Key\n"); return; } provname = wide_to_asc(pinfo->pwszProvName); contname = wide_to_asc(pinfo->pwszContainerName); - if (!provname || !contname) + if (provname == NULL || contname == NULL) goto err; BIO_printf(out, " Private Key Info:\n"); @@ -1777,7 +1778,7 @@ static int capi_load_ssl_client_cert(ENGINE *e, SSL *ssl, sk_X509_free(certs); - if (!*pcert) + if (*pcert == NULL) return 0; /* Setup key for selected certificate */ -- cgit v1.2.3