[openssl] OpenSSL_1_1_1-stable update

[tomas at openssl.org]

The branch OpenSSL_1_1_1-stable has been updated
       via  7712b43c24514f82d6f0def5240a799bc011e9fe (commit)
      from  ad6a39b22728260454461a4d04ba25fc15d3520f (commit)


- Log -----------------------------------------------------------------
commit 7712b43c24514f82d6f0def5240a799bc011e9fe
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)
    
    (cherry picked from commit 6635ea531e9f7709e5880dd77fd4c3403a5c3db7)

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

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

diff --git a/apps/enc.c b/apps/enc.c
index ddf51e0dba..79a8ef6265 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -81,7 +81,7 @@ const OPTIONS enc_options[] = {
     {"", OPT_CIPHER, '-', "Any supported cipher"},
     OPT_R_OPTIONS,
 #ifdef ZLIB
-    {"z", OPT_Z, '-', "Use zlib as the 'encryption'"},
+    {"z", OPT_Z, '-', "Compress or decompress encrypted data using zlib"},
 #endif
 #ifndef OPENSSL_NO_ENGINE
     {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
diff --git a/doc/man1/enc.pod b/doc/man1/enc.pod
index 3c7b6c42ea..9068282db5 100644
--- a/doc/man1/enc.pod
+++ b/doc/man1/enc.pod
@@ -180,8 +180,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>