[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Matt Caswell]

The branch OpenSSL_1_0_2-stable has been updated
       via  8ded5f1b148111607e34a8c3e42571db0951642b (commit)
      from  d130456f738cfd7dfb9e192aa6d1848f5faebbf0 (commit)


- Log -----------------------------------------------------------------
commit 8ded5f1b148111607e34a8c3e42571db0951642b
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Thu May 25 08:46:49 2017 +0200

    Ignore -rle and -comp when compiled with OPENSSL_NO_COMP.
    Fixes make test when configured with no-comp.
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3545)

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

Summary of changes:
 ssl/ssltest.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 8bac2bb..b75cac6 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;