aboutsummaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2000-11-30 12:22:35 +0000
committerRichard Levitte <levitte@openssl.org>2000-11-30 12:22:35 +0000
commitbd68b6b1f68eccaf96f78945b465f3bea7114f49 (patch)
treea92fdeaac36ab89b89fd02a6580b1452e635d6d0 /ssl
parentcd9b7d7c35268de18ff8789ff060349ea31af878 (diff)
downloadopenssl-bd68b6b1f68eccaf96f78945b465f3bea7114f49.tar.gz
Simplify and provide the possibility to clean a compression method.
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssltest.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 4e4ce7d096..39bfd67ae4 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -228,6 +228,7 @@ int main(int argc, char *argv[])
int print_time = 0;
clock_t s_time = 0, c_time = 0;
int comp = 0;
+ COMP_METHOD *cm;
verbose = 0;
debug = 0;
@@ -390,21 +391,18 @@ bad:
SSL_library_init();
SSL_load_error_strings();
- if (comp == COMP_ZLIB)
+ if (comp == COMP_ZLIB) cm = COMP_zlib();
+ if (comp == COMP_RLE) cm = COMP_rle();
+ if (cm != NULL)
{
- COMP_METHOD *cm = COMP_zlib();
if (cm->type != NID_undef)
- SSL_COMP_add_compression_method(COMP_ZLIB, cm);
+ SSL_COMP_add_compression_method(comp, cm);
else
- fprintf(stderr, "Warning: zlib compression not supported\n");
- }
- if (comp == COMP_RLE)
- {
- COMP_METHOD *cm = COMP_rle();
- if (cm->type != NID_undef)
- SSL_COMP_add_compression_method(COMP_RLE, cm);
- else
- fprintf(stderr, "Warning: rle compression not supported\n");
+ fprintf(stderr,
+ "Warning: %s compression not supported\n",
+ (comp == COMP_RLE ? "rle" :
+ (comp == COMP_ZLIB ? "zlib" :
+ "unknown")));
}
#if !defined(NO_SSL2) && !defined(NO_SSL3)