From 418a18a2deddc0b0d6181de0008219c899ca6ddf Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 20 Sep 2016 10:16:15 +0100 Subject: [PATCH] Style tweaks following review feedback Reviewed-by: Rich Salz --- ssl/ssl_cert.c | 2 +- ssl/statem/statem_clnt.c | 1 - ssl/t1_lib.c | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index e5fa66df53..9d359572a9 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -769,7 +769,7 @@ int ssl_add_cert_chain(SSL *s, WPACKET *pkt, CERT_PKEY *cpk) STACK_OF(X509) *chain = NULL; X509_STORE *chain_store; - if (!cpk || !cpk->x509) + if (cpk == NULL || cpk->x509 == NULL) return 1; x = cpk->x509; diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index 0752b712ba..95af064269 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -2625,7 +2625,6 @@ int tls_construct_client_verify(SSL *s) unsigned char *sig = NULL; WPACKET pkt; - if (!WPACKET_init(&pkt, s->init_buf)) { /* Should not happen */ SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, ERR_R_INTERNAL_ERROR); diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 177fa6ef69..eea78029da 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -3122,7 +3122,8 @@ static int tls12_find_nid(int id, const tls12_lookup *table, size_t tlen) int tls12_get_sigandhash(WPACKET *pkt, const EVP_PKEY *pk, const EVP_MD *md) { int sig_id, md_id; - if (!md) + + if (md == NULL) return 0; md_id = tls12_find_id(EVP_MD_type(md), tls12_md, OSSL_NELEM(tls12_md)); if (md_id == -1) -- 2.34.1