From 6bea2a72a8bfe94bb7298374d1977b2ca580c415 Mon Sep 17 00:00:00 2001 From: Rob Percival Date: Fri, 4 Mar 2016 19:07:25 +0000 Subject: [PATCH] Minor improvement to formatting of SCT output in s_client MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Emilia Käsper Reviewed-by: Rich Salz --- apps/s_client.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/s_client.c b/apps/s_client.c index cf238c795b..c338b0c525 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -2613,14 +2613,19 @@ static void print_stuff(BIO *bio, SSL *s, int full) #ifndef OPENSSL_NO_CT scts = SSL_get0_peer_scts(s); - BIO_printf(bio, "---\nSCTs present (%i)\n---\n", - scts ? sk_SCT_num(scts) : 0); - SCT_LIST_print(scts, bio, 0, "\n---\n"); - BIO_printf(bio, "\n"); + BIO_printf(bio, "---\nSCTs present (%i)\n", + scts != NULL ? sk_SCT_num(scts) : 0); + if (SSL_get_ct_validation_callback(s) == NULL) { - BIO_printf(bio, "---\nWarning: CT validation is disabled, so not all " + BIO_printf(bio, "Warning: CT validation is disabled, so not all " "SCTs may be displayed. Re-run with \"-requestct\".\n"); } + + if (scts != NULL && sk_SCT_num(scts) > 0) { + BIO_printf(bio, "---\n"); + SCT_LIST_print(scts, bio, 0, "\n---\n"); + BIO_printf(bio, "\n"); + } #endif BIO_printf(bio, -- 2.25.1