[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  6635ea531e9f7709e5880dd77fd4c3403a5c3db7 (commit)
      from  af2e1e9c81110ca1a156430686e2f171e80ebfa0 (commit)


- Log -----------------------------------------------------------------
commit 6635ea531e9f7709e5880dd77fd4c3403a5c3db7
Author: Mohamed Akram <mohd.akram at outlook.com>
Date:   Wed Mar 10 18:59:13 2021 +0400

    doc: fix enc -z option documentation
    
    CLA: trivial
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14499)

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

Summary of changes:
 apps/enc.c                  | 2 +-
 doc/man1/openssl-enc.pod.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/enc.c b/apps/enc.c
index 9982337c01..c5766f05e8 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -92,7 +92,7 @@ const OPTIONS enc_options[] = {
     {"pbkdf2", OPT_PBKDF2, '-', "Use password-based key derivation function 2"},
     {"none", OPT_NONE, '-', "Don't encrypt"},
 #ifdef ZLIB
-    {"z", OPT_Z, '-', "Use zlib as the 'encryption'"},
+    {"z", OPT_Z, '-', "Compress or decompress encrypted data using zlib"},
 #endif
     {"", OPT_CIPHER, '-', "Any supported cipher"},
 
diff --git a/doc/man1/openssl-enc.pod.in b/doc/man1/openssl-enc.pod.in
index cc0378c471..acd1486449 100644
--- a/doc/man1/openssl-enc.pod.in
+++ b/doc/man1/openssl-enc.pod.in
@@ -187,8 +187,8 @@ Debug the BIOs used for I/O.
 
 =item B<-z>
 
-Compress or decompress clear text using zlib before encryption or after
-decryption. This option exists only if OpenSSL with compiled with zlib
+Compress or decompress encrypted data using zlib after encryption or before
+decryption. This option exists only if OpenSSL was compiled with the zlib
 or zlib-dynamic option.
 
 =item B<-none>