Enable ssl-trace by default

There doesn't appear to be a good reason to omit protocol message tracing by default.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15665)
This commit is contained in:
Arran Cudbard-Bell 2021-06-08 16:45:38 -05:00 committed by Matt Caswell
parent 25959e04c3
commit 726f92e016
4 changed files with 9 additions and 9 deletions

View File

@ -548,7 +548,6 @@ our %disabled = ( # "what" => "comment"
"msan" => "default",
"rc5" => "default",
"sctp" => "default",
"ssl-trace" => "default",
"ssl3" => "default",
"ssl3-method" => "default",
"trace" => "default",
@ -575,7 +574,7 @@ my @disable_cascades = (
"rc2", "rc4", "rmd160",
"seed", "siphash", "siv",
"sm3", "sm4", "srp",
"srtp", "ssl3-method",
"srtp", "ssl3-method", "ssl-trace",
"ts", "ui-console", "whirlpool",
"fips-securitychecks" ],
sub { $config{processor} eq "386" }

View File

@ -850,11 +850,14 @@ disengage SSE2 code paths upon application start-up, but if you aim for wider
"audience" running such kernel, consider `no-sse2`. Both the `386` and `no-asm`
options imply `no-sse2`.
### enable-ssl-trace
### no-ssl-trace
Build with the SSL Trace capabilities.
Don't build with SSL Trace capabilities.
This adds the `-trace` option to `s_client` and `s_server`.
This removes the `-trace` option from `s_client` and `s_server`, and omits the
`SSL_trace()` function from libssl.
Disabling `ssl-trace` may provide a small reduction in libssl binary size.
### no-static-engine

View File

@ -460,8 +460,7 @@ Show all protocol messages with hex dump.
=item B<-trace>
Show verbose trace output of protocol messages. OpenSSL needs to be compiled
with B<enable-ssl-trace> for this option to work.
Show verbose trace output of protocol messages.
=item B<-msgfile> I<filename>

View File

@ -536,8 +536,7 @@ Configure SSL_CTX using the given configuration value.
=item B<-trace>
Show verbose trace output of protocol messages. OpenSSL needs to be compiled
with B<enable-ssl-trace> for this option to work.
Show verbose trace output of protocol messages.
=item B<-brief>