From b2555168ecf6e88ad9aeb0ad4f7b7a714901d575 Mon Sep 17 00:00:00 2001 From: KaoruToda Date: Fri, 20 Oct 2017 22:58:46 -0400 Subject: Various clean-ups Add a check for NULL return in t1_lib.c. Since return type of ssl_cert_lookup_by_idx is pointer and unify coding style, I changed from zero to NULL in ssl_cert.c. Remove unnecessary space for ++. Fix incorrect condition Expression is always false because 'else if' condition matches previous condition. SInce the next line of 'else if' condition has substituted TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2, the 'else if' condition should compare with NID_X9_62_characteristic_two_field. Reviewed-by: Andy Polyakov Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/4562) --- ssl/ssl_cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ssl/ssl_cert.c') diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 3de3c2c7c5..43b084d607 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -1002,6 +1002,6 @@ const SSL_CERT_LOOKUP *ssl_cert_lookup_by_pkey(const EVP_PKEY *pk, size_t *pidx) const SSL_CERT_LOOKUP *ssl_cert_lookup_by_idx(size_t idx) { if (idx >= OSSL_NELEM(ssl_cert_info)) - return 0; + return NULL; return &ssl_cert_info[idx]; } -- cgit v1.2.3