[openssl] master update

[matthias.st.pierre at ncp-e.com]

The branch master has been updated
       via  e978ab7894e966579fcd372d7cba9e051ba90150 (commit)
      from  e847085914476636d75ee1874b78e1c0e983da6e (commit)


- Log -----------------------------------------------------------------
commit e978ab7894e966579fcd372d7cba9e051ba90150
Author: Dr. Matthias St. Pierre <matthias.st.pierre at ncp-e.com>
Date:   Sun May 10 02:42:58 2020 +0200

    doc: fix trace category names
    
    The `ENGINE_CONF` and `PROVIDER_CONF` trace categories were merged
    into a single `CONF` category (see bc362b9b7202 and 71849dff56d6).
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/11806)

-----------------------------------------------------------------------

Summary of changes:
 doc/man1/openssl.pod                | 4 ++--
 doc/man3/OSSL_trace_set_channel.pod | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/man1/openssl.pod b/doc/man1/openssl.pod
index 7170a98448..4bf1a00b0e 100644
--- a/doc/man1/openssl.pod
+++ b/doc/man1/openssl.pod
@@ -1298,9 +1298,9 @@ General SSL/TLS.
 
 SSL/TLS cipher.
 
-=item B<ENGINE_CONF>
+=item B<CONF>
 
-ENGINE configuration.
+Show details about provider and engine configuration.
 
 =item B<ENGINE_TABLE>
 
diff --git a/doc/man3/OSSL_trace_set_channel.pod b/doc/man3/OSSL_trace_set_channel.pod
index 1105479af2..57a5a1c8c9 100644
--- a/doc/man3/OSSL_trace_set_channel.pod
+++ b/doc/man3/OSSL_trace_set_channel.pod
@@ -178,9 +178,9 @@ point during evaluation.
 
 Traces BIGNUM context operations.
 
-=item C<OSSL_TRACE_CATEGORY_PROVIDER_CONF>
+=item C<OSSL_TRACE_CATEGORY_CONF>
 
-Traces the OSSL_PROVIDER configuration.
+Traces details about the provider and engine configuration.
 
 =back