From: Shigeki Ohtsu <ohtsu@ohtsu.org>
Date: Thu, 24 Jan 2019 13:45:50 +0000 (+0900)
Subject: s_client: fix not to send a command letter of R
X-Git-Tag: openssl-3.0.0-alpha1~2609
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=5478e2100260b8d6f9df77de875f37763d8eeec6

s_client: fix not to send a command letter of R

Before 1.1.0, this command letter is not sent to a server.

CLA: trivial
(cherry picked from commit bc180cb4887c2e82111cb714723a94de9f6d2c35)

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8081)
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 9705c4c56e..6e06f15f0f 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -3083,9 +3083,7 @@ int s_client_main(int argc, char **argv)
                 BIO_printf(bio_err, "RENEGOTIATING\n");
                 SSL_renegotiate(con);
                 cbuf_len = 0;
-            }
-
-            if (!c_ign_eof && (cbuf[0] == 'K' || cbuf[0] == 'k' )
+	    } else if (!c_ign_eof && (cbuf[0] == 'K' || cbuf[0] == 'k' )
                     && cmdletters) {
                 BIO_printf(bio_err, "KEYUPDATE\n");
                 SSL_key_update(con,