[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  5478e2100260b8d6f9df77de875f37763d8eeec6 (commit)
      from  d7bcbfd0828616f33008e711eabc6ec00b32e87b (commit)


- Log -----------------------------------------------------------------
commit 5478e2100260b8d6f9df77de875f37763d8eeec6
Author: Shigeki Ohtsu <ohtsu at ohtsu.org>
Date:   Thu Jan 24 22:45:50 2019 +0900

    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 at mit.edu>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8081)

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

Summary of changes:
 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 9705c4c..6e06f15 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,