summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorBernd Edlinger <bernd.edlinger@hotmail.de>2017-05-25 08:46:49 +0200
committerMatt Caswell <matt@openssl.org>2017-05-25 12:36:45 +0100
commit8ded5f1b148111607e34a8c3e42571db0951642b (patch)
treebbcaa461598575d627e0dd7ac0f4a7aa94ac3045 /ssl
parentd130456f738cfd7dfb9e192aa6d1848f5faebbf0 (diff)
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)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssltest.c12
1 files changed, 10 insertions, 2 deletions
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;