diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-10-12 17:45:56 -0400 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2020-01-31 16:33:53 +0100 |
| commit | 8b3efb53027dd4f7d51b7ca9dd9658f02d6f1b1a (patch) | |
| tree | 4d814226fa1817b548cd066df36dfd57a5251a9b /doc/perlvars.pm | |
| parent | c98eab85b8a6c5d49353a229ac1d2f4cd0b84682 (diff) | |
Update the SSL/TLS connection options
Refactor common flags for SSL/TLS connection options.
Update SSL_CONF_cmd.pod to match ordering.
Rewrite much of the documentation.
Fixes #10160
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/10191)
Diffstat (limited to 'doc/perlvars.pm')
| -rw-r--r-- | doc/perlvars.pm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/doc/perlvars.pm b/doc/perlvars.pm index c20f4aedaa..bae8b15e83 100644 --- a/doc/perlvars.pm +++ b/doc/perlvars.pm @@ -65,7 +65,7 @@ $OpenSSL::safe::opt_x_synopsis = "" $OpenSSL::safe::opt_x_item = "" . "=item B<xkey> I<infile>, B<-xcert> I<file>, B<-xchain> I<file>,\n" . "B<-xchain_build> I<file>, B<-xcertform> B<DER>|B<PEM>,\n" -. "B<-xkeyform> B<DER>|B<PEM>>\n" +. "B<-xkeyform> B<DER>|B<PEM>\n" . "\n" . "Set extended certificate verification options.\n" . "See L<openssl(1)/Extended Verification Options> for details."; @@ -143,16 +143,17 @@ $OpenSSL::safe::opt_version_item = "\n" . "See L<openssl(1)/TLS Version Options>."; # SSL connection options. -# TODO options will probably be re-ordered. +# TODO # options will probably be re-ordered. $OpenSSL::safe::opt_s_synopsis = "" . "[B<-bugs>]\n" . "[B<-no_comp>]\n" +. "[B<-comp>]\n" . "[B<-no_ticket>]\n" . "[B<-serverpref>]\n" . "[B<-legacy_renegotiation>]\n" . "[B<-no_renegotiation>]\n" -. "[B<-legacy_server_connect>]\n" . "[B<-no_resumption_on_reneg>]\n" +. "[B<-legacy_server_connect>]\n" . "[B<-no_legacy_server_connect>]\n" . "[B<-allow_no_dhe_kex>]\n" . "[B<-prioritize_chacha>]\n" @@ -161,7 +162,7 @@ $OpenSSL::safe::opt_s_synopsis = "" . "[B<-client_sigalgs> I<algs>]\n" . "[B<-groups> I<groups>]\n" . "[B<-curves> I<curves>]\n" -. "[B<-named_curve> I<curves>]\n" +. "[B<-named_curve> I<curve>]\n" . "[B<-cipher> I<ciphers>]\n" . "[B<-ciphersuites> I<1.3ciphers>]\n" . "[B<-min_protocol> I<minprot>]\n" @@ -170,12 +171,12 @@ $OpenSSL::safe::opt_s_synopsis = "" . "[B<-debug_broken_protocol>]\n" . "[B<-no_middlebox>]"; $OpenSSL::safe::opt_s_item = "" -. "=item B<-bugs>, B<-no_comp>, B<-no_ticket>, B<-serverpref>," -. "B<-legacy_renegotiation>, B<-no_renegotiation>, B<-legacy_server_connect>,\n" -. "B<-no_resumption_on_reneg>, B<-no_legacy_server_connect>,\n" +. "=item B<-bugs>, B<-comp>, B<-no_comp>, B<-no_ticket>, B<-serverpref>,\n" +. "B<-legacy_renegotiation>, B<-no_renegotiation>, 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" -. "I<curves>, B<-named_curve> I<curves>, B<-cipher> I<ciphers>, B<-ciphersuites>\n" +. "I<curves>, B<-named_curve> I<curve>, B<-cipher> I<ciphers>, B<-ciphersuites>\n" . "I<1.3ciphers>, B<-min_protocol> I<minprot>, B<-max_protocol> I<maxprot>,\n" . "B<-record_padding> I<padding>, B<-debug_broken_protocol>, B<-no_middlebox>\n" . "\n" |