From cbbbc8fce41cc162c75d1e5bd1053b6085cb3b47 Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Mon, 3 May 2021 13:43:55 -0700 Subject: [PATCH] Correct ssl_conf logic for "legacy_server_connect" This option is only useful for the client, but it was previously marked as only being applicable for servers. Correct the entry to properly mark it as client-only, and update the s_server/s_client manuals accordingly. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/15127) --- doc/man1/openssl-s_client.pod.in | 1 + doc/man1/openssl-s_server.pod.in | 1 - ssl/ssl_conf.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/man1/openssl-s_client.pod.in b/doc/man1/openssl-s_client.pod.in index 6d6ba813845..e11df7a9ae6 100644 --- a/doc/man1/openssl-s_client.pod.in +++ b/doc/man1/openssl-s_client.pod.in @@ -83,6 +83,7 @@ B B [B<-comp>] [B<-no_comp>] [B<-brief>] +[B<-legacy_server_connect>] [B<-allow_no_dhe_kex>] [B<-sigalgs> I] [B<-curves> I] diff --git a/doc/man1/openssl-s_server.pod.in b/doc/man1/openssl-s_server.pod.in index 243ab8b3e0a..fa4190a869a 100644 --- a/doc/man1/openssl-s_server.pod.in +++ b/doc/man1/openssl-s_server.pod.in @@ -94,7 +94,6 @@ B B [B<-serverpref>] [B<-legacy_renegotiation>] [B<-no_renegotiation>] -[B<-legacy_server_connect>] [B<-no_resumption_on_reneg>] [B<-no_legacy_server_connect>] [B<-allow_no_dhe_kex>] diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c index 4e71a9cf64e..1f288b5e06d 100644 --- a/ssl/ssl_conf.c +++ b/ssl/ssl_conf.c @@ -684,7 +684,7 @@ static const ssl_conf_cmd_tbl ssl_conf_cmds[] = { SSL_CONF_CMD_SWITCH("no_ticket", 0), SSL_CONF_CMD_SWITCH("serverpref", SSL_CONF_FLAG_SERVER), SSL_CONF_CMD_SWITCH("legacy_renegotiation", 0), - SSL_CONF_CMD_SWITCH("legacy_server_connect", SSL_CONF_FLAG_SERVER), + SSL_CONF_CMD_SWITCH("legacy_server_connect", SSL_CONF_FLAG_CLIENT), SSL_CONF_CMD_SWITCH("no_renegotiation", 0), SSL_CONF_CMD_SWITCH("no_resumption_on_reneg", SSL_CONF_FLAG_SERVER), SSL_CONF_CMD_SWITCH("no_legacy_server_connect", SSL_CONF_FLAG_SERVER), -- 2.47.2