diff options
| author | Benjamin Kaduk <bkaduk@akamai.com> | 2021-05-03 13:43:55 -0700 |
|---|---|---|
| committer | Benjamin Kaduk <kaduk@mit.edu> | 2021-05-05 08:13:51 -0700 |
| commit | cbbbc8fce41cc162c75d1e5bd1053b6085cb3b47 (patch) | |
| tree | 79d459e98274b378e9ec1c5999fa639ecc18dac0 | |
| parent | 72d2670bd21becfa6a64bb03fa55ad82d6d0c0f3 (diff) | |
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 <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15127)
| -rw-r--r-- | doc/man1/openssl-s_client.pod.in | 1 | ||||
| -rw-r--r-- | doc/man1/openssl-s_server.pod.in | 1 | ||||
| -rw-r--r-- | 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 6d6ba81384..e11df7a9ae 100644 --- a/doc/man1/openssl-s_client.pod.in +++ b/doc/man1/openssl-s_client.pod.in @@ -83,6 +83,7 @@ B<openssl> B<s_client> [B<-comp>] [B<-no_comp>] [B<-brief>] +[B<-legacy_server_connect>] [B<-allow_no_dhe_kex>] [B<-sigalgs> I<sigalglist>] [B<-curves> I<curvelist>] diff --git a/doc/man1/openssl-s_server.pod.in b/doc/man1/openssl-s_server.pod.in index 243ab8b3e0..fa4190a869 100644 --- a/doc/man1/openssl-s_server.pod.in +++ b/doc/man1/openssl-s_server.pod.in @@ -94,7 +94,6 @@ B<openssl> B<s_server> [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 4e71a9cf64..1f288b5e06 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), |