[openssl] master update

[beldmit at gmail.com]

The branch master has been updated
       via  4639772523e5cb979722483b9374e0c275afde7d (commit)
       via  6581b17dedb77112fca328a09d6073723a013727 (commit)
      from  ca6197ca3c1a18be004c447cf4bf5a1a40d7dd19 (commit)


- Log -----------------------------------------------------------------
commit 4639772523e5cb979722483b9374e0c275afde7d
Author: Dmitry Belyavskiy <beldmit at gmail.com>
Date:   Fri May 7 17:36:42 2021 +0200

    clarification about the DES status
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15197)

commit 6581b17dedb77112fca328a09d6073723a013727
Author: Dmitry Belyavskiy <beldmit at gmail.com>
Date:   Fri May 7 17:16:29 2021 +0200

    Enumerating the legacy provider's cipher algorithms
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15197)

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

Summary of changes:
 doc/man3/EVP_des_cbc.pod          |  4 ++++
 doc/man3/EVP_desx_cbc.pod         |  4 ++++
 doc/man7/OSSL_PROVIDER-legacy.pod | 26 ++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/doc/man3/EVP_des_cbc.pod b/doc/man3/EVP_des_cbc.pod
index d00179eacb..bcae9d7a4e 100644
--- a/doc/man3/EVP_des_cbc.pod
+++ b/doc/man3/EVP_des_cbc.pod
@@ -54,6 +54,10 @@ EVP_des_ofb()
 DES in CBC, ECB, CFB with 64-bit shift, CFB with 1-bit shift, CFB with 8-bit
 shift and OFB modes.
 
+None of these algorithms are provided by the OpenSSL default provider.
+To use them it is necessary to load either the OpenSSL legacy provider or another
+implementation.
+
 =item EVP_des_ede(),
 EVP_des_ede_cbc(),
 EVP_des_ede_cfb(),
diff --git a/doc/man3/EVP_desx_cbc.pod b/doc/man3/EVP_desx_cbc.pod
index c9e250f34c..2a41e08898 100644
--- a/doc/man3/EVP_desx_cbc.pod
+++ b/doc/man3/EVP_desx_cbc.pod
@@ -23,6 +23,10 @@ All modes below use a key length of 128 bits and acts on blocks of 128-bits.
 
 The DES-X algorithm in CBC mode.
 
+This algorithm is not provided by the OpenSSL default provider.
+To use it is necessary to load either the OpenSSL legacy provider or another
+implementation.
+
 =back
 
 =head1 RETURN VALUES
diff --git a/doc/man7/OSSL_PROVIDER-legacy.pod b/doc/man7/OSSL_PROVIDER-legacy.pod
index 36aeafec94..86ac3fa9a0 100644
--- a/doc/man7/OSSL_PROVIDER-legacy.pod
+++ b/doc/man7/OSSL_PROVIDER-legacy.pod
@@ -52,6 +52,32 @@ The OpenSSL legacy provider supports these operations and algorithms:
 
 =back
 
+=head2 Symmetric Ciphers
+
+Not all of these symmetric cipher algorithms are enabled by default.
+
+=over 4
+
+=item Blowfish
+
+=item CAST
+
+=item DES
+
+=item IDEA
+
+=item RC2
+
+=item RC4
+
+=item RC5
+
+Disabled by default. Use I<enable-rc5> config option to enable.
+
+=item SEED
+
+=back
+
 =begin comment
 
 When algorithms for other operations start appearing, the