From 24020351dc2f1565347a93ad60d70b065415c84f Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Thu, 24 Jan 2019 22:45:50 +0900 Subject: [PATCH] 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 Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/8081) (cherry picked from commit 5478e2100260b8d6f9df77de875f37763d8eeec6) --- apps/s_client.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/s_client.c b/apps/s_client.c index dcaa10cf44..5925814871 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -3031,9 +3031,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, -- 2.25.1