diff options
| author | Rich Salz <rsalz@akamai.com> | 2021-06-13 10:49:47 -0400 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-06-15 12:36:51 +0200 |
| commit | 5bbe2134188a45a937e7aefd46b7eeee258d0ab8 (patch) | |
| tree | 9c122ebcd8a8f15601669542458e112052e4c297 /doc | |
| parent | f4752e88272933777dbdbda31d00b388fa5a8e2d (diff) | |
| download | openssl-new-5bbe2134188a45a937e7aefd46b7eeee258d0ab8.tar.gz | |
Remove "-immedate_renegotiation" option
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15415)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man3/SSL_CONF_cmd.pod | 6 | ||||
| -rw-r--r-- | doc/perlvars.pm | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/doc/man3/SSL_CONF_cmd.pod b/doc/man3/SSL_CONF_cmd.pod index 68c05d33d7..7971d6e0b5 100644 --- a/doc/man3/SSL_CONF_cmd.pod +++ b/doc/man3/SSL_CONF_cmd.pod @@ -83,12 +83,6 @@ Sets B<SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION>. Only used by servers. Permits or prohibits the use of unsafe legacy renegotiation for OpenSSL clients only. Equivalent to setting or clearing B<SSL_OP_LEGACY_SERVER_CONNECT>. -=item B<-immediate_renegotiation> - -Try to do a renegotiation immediately after the handshake. -This is for debugging and has no option equivalent. -Ignored by the B<openssl s_client> command. - =item B<-prioritize_chacha> Prioritize ChaCha ciphers when the client has a ChaCha20 cipher at the top of diff --git a/doc/perlvars.pm b/doc/perlvars.pm index 71f3888d58..133ad3c416 100644 --- a/doc/perlvars.pm +++ b/doc/perlvars.pm @@ -183,7 +183,6 @@ $OpenSSL::safe::opt_s_synopsis = "" . "[B<-legacy_renegotiation>]\n" . "[B<-no_renegotiation>]\n" . "[B<-no_resumption_on_reneg>]\n" -. "[B<-immediate_renegotiation>]\n" . "[B<-legacy_server_connect>]\n" . "[B<-no_legacy_server_connect>]\n" . "[B<-allow_no_dhe_kex>]\n" @@ -203,9 +202,9 @@ $OpenSSL::safe::opt_s_synopsis = "" . "[B<-no_middlebox>]"; $OpenSSL::safe::opt_s_item = "" . "=item B<-bugs>, B<-comp>, B<-no_comp>, B<-no_ticket>, B<-serverpref>,\n" -. "B<-client_renegotiation>, B<_immediate_renegotiation>,\n" +. "B<-client_renegotiation>,\n" . "B<-legacy_renegotiation>, B<-no_renegotiation>,\n" -. "B<-immediate_renegotiation>, B<-no_resumption_on_reneg>,\n" +. "B<-no_resumption_on_reneg>,\n" . "B<-legacy_server_connect>, B<-no_legacy_server_connect>,\n" . "B<-allow_no_dhe_kex>, B<-prioritize_chacha>, B<-strict>, B<-sigalgs>\n" . "I<algs>, B<-client_sigalgs> I<algs>, B<-groups> I<groups>, B<-curves>\n" |