aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@ohtsu.org>2019-01-24 22:45:50 +0900
committerMatt Caswell <matt@openssl.org>2019-01-27 11:59:15 +0000
commit5478e2100260b8d6f9df77de875f37763d8eeec6 (patch)
treeca543a3580a40560819156abd1c87771e381a34e
parentd7bcbfd0828616f33008e711eabc6ec00b32e87b (diff)
downloadopenssl-5478e2100260b8d6f9df77de875f37763d8eeec6.zip
openssl-5478e2100260b8d6f9df77de875f37763d8eeec6.tar.gz
openssl-5478e2100260b8d6f9df77de875f37763d8eeec6.tar.bz2
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)
-rw-r--r--apps/s_client.c4
1 files changed, 1 insertions, 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,