diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-05-08 12:05:36 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-05-12 10:24:48 -0400 |
| commit | 9a555706a3fb8f6622e1049ab510a12f4e1bc6a2 (patch) | |
| tree | d13efcdaae67e53a1ae4688d6927f406ada913ab /test/ssltest.c | |
| parent | 253617806da0aeb0cea1fedf6136460fb4993eae (diff) | |
| download | openssl-9a555706a3fb8f6622e1049ab510a12f4e1bc6a2.zip openssl-9a555706a3fb8f6622e1049ab510a12f4e1bc6a2.tar.gz openssl-9a555706a3fb8f6622e1049ab510a12f4e1bc6a2.tar.bz2 | |
Make COMP_CTX and COMP_METHOD opaque
Since COMP_METHOD is now defined in comp_lcl.h, it is no
longer possible to create new TLS compression methods without
using the OpenSSL source. Only ZLIB is supported by default.
Also, since the types are opaque, #ifdef guards to use "char *"
instead of the real type aren't necessary.
The changes are actually minor. Adding missing copyright to some
files makes the diff misleadingly big.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'test/ssltest.c')
| -rw-r--r-- | test/ssltest.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/ssltest.c b/test/ssltest.c index 39f1d80..e531b32 100644 --- a/test/ssltest.c +++ b/test/ssltest.c @@ -995,7 +995,7 @@ int main(int argc, char *argv[]) int print_time = 0; clock_t s_time = 0, c_time = 0; #ifndef OPENSSL_NO_COMP - int comp = 0; + int n, comp = 0; COMP_METHOD *cm = NULL; STACK_OF(SSL_COMP) *ssl_comp_methods = NULL; #endif @@ -1004,7 +1004,6 @@ int main(int argc, char *argv[]) int fips_mode = 0; #endif int no_protocol = 0; - int n; SSL_CONF_CTX *s_cctx = NULL, *c_cctx = NULL; STACK_OF(OPENSSL_STRING) *conf_args = NULL; @@ -1373,7 +1372,7 @@ int main(int argc, char *argv[]) if (comp == COMP_ZLIB) cm = COMP_zlib(); if (cm != NULL) { - if (cm->type != NID_undef) { + if (COMP_get_type(cm) != NID_undef) { if (SSL_COMP_add_compression_method(comp, cm) != 0) { fprintf(stderr, "Failed to add compression method\n"); ERR_print_errors_fp(stderr); |