Fix compilation with OpenSSL 1.1.0 --enable-gcc-warnings is set.

This commit is contained in:
Yawning Angel 2015-11-06 19:12:43 +00:00
parent 3e3ec750cd
commit 89cb2e467d

View File

@ -130,7 +130,6 @@ test_tortls_tor_tls_new(void *data)
MOCK(tor_tls_cert_matches_key, mock_tls_cert_matches_key); MOCK(tor_tls_cert_matches_key, mock_tls_cert_matches_key);
crypto_pk_t *key1 = NULL, *key2 = NULL; crypto_pk_t *key1 = NULL, *key2 = NULL;
SSL_METHOD *method = NULL; SSL_METHOD *method = NULL;
SSL_CTX *ctx = NULL;
key1 = pk_generate(2); key1 = pk_generate(2);
key2 = pk_generate(3); key2 = pk_generate(3);
@ -148,7 +147,7 @@ test_tortls_tor_tls_new(void *data)
#ifndef OPENSSL_OPAQUE #ifndef OPENSSL_OPAQUE
method = give_me_a_test_method(); method = give_me_a_test_method();
ctx = SSL_CTX_new(method); SSL_CTX *ctx = SSL_CTX_new(method);
method->num_ciphers = fake_num_ciphers; method->num_ciphers = fake_num_ciphers;
client_tls_context->ctx = ctx; client_tls_context->ctx = ctx;
tls = tor_tls_new(-1, 0); tls = tor_tls_new(-1, 0);