]> granicus.if.org Git - openssl/commitdiff
Ignore -rle and -comp when compiled with OPENSSL_NO_COMP.
authorBernd Edlinger <bernd.edlinger@hotmail.de>
Thu, 25 May 2017 06:46:49 +0000 (08:46 +0200)
committerMatt Caswell <matt@openssl.org>
Thu, 25 May 2017 11:36:45 +0000 (12:36 +0100)
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)

ssl/ssltest.c

index 8bac2bb87e918fafc30067b4f0176db2057d7366..b75cac61fbdc4205b2e31c933405bdae573d1752 100644 (file)
@@ -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;