From 3cea64b50cfe4d7ad130c330357c9fb1940aa797 Mon Sep 17 00:00:00 2001 From: Remi Tricot-Le Breton Date: Fri, 17 Dec 2021 18:53:23 +0100 Subject: [PATCH] MINOR: ssl: Remove empty lines from "show ssl ocsp-response" output There were empty lines in the output of the CLI's "show ssl ocsp-response" command (after the certificate ID and between two certificates). This patch removes them since an empty line should mark the end of the output. Must be backported in 2.5. (cherry picked from commit cc750efbc5c2180ed63b222a51029609ea96d0f7) Signed-off-by: William Lallemand --- doc/management.txt | 1 - src/ssl_sock.c | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/management.txt b/doc/management.txt index ceb9cb2..c67f196 100644 --- a/doc/management.txt +++ b/doc/management.txt @@ -3194,7 +3194,6 @@ show ssl ocsp-response [] # Certificate IDs Certificate ID key : 303b300906052b0e03021a050004148a83e0060faff709ca7e9b95522a2e81635fda0a0414f652b0e435d5ea923851508f0adbe92d85de007a0202100a Certificate ID: - Issuer Name Hash: 8A83E0060FAFF709CA7E9B95522A2E81635FDA0A Issuer Key Hash: F652B0E435D5EA923851508F0ADBE92D85DE007A Serial Number: 100A diff --git a/src/ssl_sock.c b/src/ssl_sock.c index e3e3abf..f000df7 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -7187,13 +7187,12 @@ static inline int ocsp_certid_print(BIO *bp, OCSP_CERTID *certid, int indent) BIO_printf(bp, "%*sCertificate ID:\n", indent, ""); indent += 2; - BIO_printf(bp, "\n%*sIssuer Name Hash: ", indent, ""); + BIO_printf(bp, "%*sIssuer Name Hash: ", indent, ""); i2a_ASN1_STRING(bp, piNameHash, 0); BIO_printf(bp, "\n%*sIssuer Key Hash: ", indent, ""); i2a_ASN1_STRING(bp, piKeyHash, 0); BIO_printf(bp, "\n%*sSerial Number: ", indent, ""); i2a_ASN1_INTEGER(bp, pSerial); - BIO_printf(bp, "\n"); } return 1; } @@ -7253,6 +7252,9 @@ static int cli_io_handler_show_ocspresponse(struct appctx *appctx) /* Dump the CERTID info */ ocsp_certid_print(bio, certid, 1); write = BIO_read(bio, tmp->area, tmp->size-1); + /* strip trailing LFs */ + while (write > 0 && tmp->area[write-1] == '\n') + write--; tmp->area[write] = '\0'; chunk_appendf(trash, "%s\n", tmp->area); -- 1.7.10.4