[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  fc1ccdffe96bc9d32f4287c31f7ff99f9dd37854 (commit)
      from  a49d0a491c659aacabadc957ab11c738db03a734 (commit)


- Log -----------------------------------------------------------------
commit fc1ccdffe96bc9d32f4287c31f7ff99f9dd37854
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Oct 21 14:30:31 2020 +1000

    enc: change the text to reference `-list` instead of the deprecated `-ciphers`
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/13204)

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

Summary of changes:
 doc/man1/openssl-enc.pod.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man1/openssl-enc.pod.in b/doc/man1/openssl-enc.pod.in
index 954b17e778..27da1c70aa 100644
--- a/doc/man1/openssl-enc.pod.in
+++ b/doc/man1/openssl-enc.pod.in
@@ -256,7 +256,7 @@ Blowfish and RC5 algorithms use a 128 bit key.
 Note that some of these ciphers can be disabled at compile time
 and some are available only if an appropriate engine is configured
 in the configuration file. The output when invoking this command
-with the B<-ciphers> option (that is C<openssl enc -ciphers>) is
+with the B<-list> option (that is C<openssl enc -list>) is
 a list of ciphers, supported by your version of OpenSSL, including
 ones provided by configured engines.