[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  1a9f5cf0d58629ab8972f50e937d8ab78bf27b6f (commit)
      from  0c714ba214eeceec617703fa1b9fc1cc4521529d (commit)


- Log -----------------------------------------------------------------
commit 1a9f5cf0d58629ab8972f50e937d8ab78bf27b6f
Author: Xiaoyin Liu <xiaoyinl at users.noreply.github.com>
Date:   Sat Aug 5 02:31:04 2017 -0400

    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 at openssl.org>
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4088)

-----------------------------------------------------------------------

Summary of changes:
 apps/s_server.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/s_server.c b/apps/s_server.c
index 2ff58b6..0ee5519 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -3113,9 +3113,10 @@ static int www_body(int s, int stype, int prot, 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)) {