From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Thu, 25 May 2017 06:46:49 +0000 (+0200)
Subject: Ignore -rle and -comp when compiled with OPENSSL_NO_COMP.
X-Git-Tag: OpenSSL_1_0_2l~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8ded5f1b148111607e34a8c3e42571db0951642b;p=oweals%2Fopenssl.git

Ignore -rle and -comp when compiled with OPENSSL_NO_COMP.
Fixes make test when configured with no-comp.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3545)
---

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 8bac2bb87e..b75cac61fb 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -1239,13 +1239,21 @@ int main(int argc, char *argv[])
         } else if (strcmp(*argv, "-time") == 0) {
             print_time = 1;
         }
-#ifndef OPENSSL_NO_COMP
         else if (strcmp(*argv, "-zlib") == 0) {
+#ifndef OPENSSL_NO_COMP
             comp = COMP_ZLIB;
+#else
+            fprintf(stderr,
+                    "ignoring -zlib, since I'm compiled without COMP\n");
+#endif
         } else if (strcmp(*argv, "-rle") == 0) {
+#ifndef OPENSSL_NO_COMP
             comp = COMP_RLE;
-        }
+#else
+            fprintf(stderr,
+                    "ignoring -rle, since I'm compiled without COMP\n");
 #endif
+        }
         else if (strcmp(*argv, "-named_curve") == 0) {
             if (--argc < 1)
                 goto bad;