commit 802d2243083a46fbb4afb15a78c3db07f0092af3
author Richard Levitte <levitte@openssl.org> Wed Apr 13 02:40:39 2016 +0200
committer Richard Levitte <levitte@openssl.org> Wed Apr 13 11:36:46 2016 +0200
tree 434c9dbad28cd07d47274f61b6f59e7e342b3fe9
parent da430a5555b97cc0fe5e9bf6cfd64be98e8b5bcb

Don't use FORMAT_BASE64 format when compressing / decompressing

When compressing, the output / input is a binary format, not a text
format like BASE64.  This is important on Windows, where a ^Z in a
text file is seen as EOF, and there could be a ^Z somewhere in a
compressed file, cutting it short as input.

Reviewed-by: Matt Caswell <matt@openssl.org>

apps/enc.c

diff --git a/apps/enc.c b/apps/enc.c
index 7869987..7f25009 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -313,12 +313,15 @@
     if (verbose)
         BIO_printf(bio_err, "bufsize=%d\n", bsize);
 
-    if (base64) {
-        if (enc)
-            outformat = FORMAT_BASE64;
-        else
-            informat = FORMAT_BASE64;
-    }
+#ifdef ZLIB
+    if (!do_zlib)
+#endif
+        if (base64) {
+            if (enc)
+                outformat = FORMAT_BASE64;
+            else
+                informat = FORMAT_BASE64;
+        }
 
     strbuf = app_malloc(SIZE, "strbuf");
     buff = app_malloc(EVP_ENCODE_LENGTH(bsize), "evp buffer");