From: Xiaoyin Liu <xiaoyinl@users.noreply.github.com>
Date: Sat, 5 Aug 2017 06:31:04 +0000 (-0400)
Subject: Add missing HTML tag in www_body in s_server.c
X-Git-Tag: OpenSSL_1_1_0g~103
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=575d492222ef457b456672e2d62a18daca03459a;p=oweals%2Fopenssl.git

Add missing HTML tag in www_body in s_server.c

In the generated HTML document, the `<pre>` tag is not closed. This patch
also has a trivial code-style improvement, unrelated to the bug fix.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4088)

(cherry picked from commit 1a9f5cf0d58629ab8972f50e937d8ab78bf27b6f)
---

diff --git a/apps/s_server.c b/apps/s_server.c
index 7e18aaf0f8..bf1f104e5c 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2853,9 +2853,10 @@ static int www_body(int s, int stype, unsigned char *context)
                 PEM_write_bio_X509(io, peer);
                 X509_free(peer);
                 peer = NULL;
-            } else
+            } else {
                 BIO_puts(io, "no client certificate available\n");
-            BIO_puts(io, "</BODY></HTML>\r\n\r\n");
+            }
+            BIO_puts(io, "</pre></BODY></HTML>\r\n\r\n");
             break;
         } else if ((www == 2 || www == 3)
                    && (strncmp("GET /", buf, 5) == 0)) {