From 89cb2e467dd66d659cb9492e0b59c35f5d6bab57 Mon Sep 17 00:00:00 2001 From: Yawning Angel Date: Fri, 6 Nov 2015 19:12:43 +0000 Subject: Fix compilation with OpenSSL 1.1.0 --enable-gcc-warnings is set. --- src/test/test_tortls.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/test/test_tortls.c') diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 280e7fa3b0..3352ed61ee 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -130,7 +130,6 @@ test_tortls_tor_tls_new(void *data) MOCK(tor_tls_cert_matches_key, mock_tls_cert_matches_key); crypto_pk_t *key1 = NULL, *key2 = NULL; SSL_METHOD *method = NULL; - SSL_CTX *ctx = NULL; key1 = pk_generate(2); key2 = pk_generate(3); @@ -148,7 +147,7 @@ test_tortls_tor_tls_new(void *data) #ifndef OPENSSL_OPAQUE method = give_me_a_test_method(); - ctx = SSL_CTX_new(method); + SSL_CTX *ctx = SSL_CTX_new(method); method->num_ciphers = fake_num_ciphers; client_tls_context->ctx = ctx; tls = tor_tls_new(-1, 0); -- cgit v1.2.3-54-g00ecf From 6512df34a4696a3adb1a2b3207fe7c886376aac5 Mon Sep 17 00:00:00 2001 From: Yawning Angel Date: Fri, 6 Nov 2015 19:42:39 +0000 Subject: Fix the tortls.c unit tests to pass with OpenSSL 1.1.0-dev. The string description for the states got changed slightly. --- src/test/test_tortls.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'src/test/test_tortls.c') diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 3352ed61ee..90bf0d3ce5 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -55,6 +55,9 @@ extern tor_tls_context_t *client_tls_context; #if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) #define OPENSSL_OPAQUE +#define SSL_STATE_STR "before SSL initialization" +#else +#define SSL_STATE_STR "before/accept initialization" #endif #ifndef OPENSSL_OPAQUE @@ -235,35 +238,35 @@ test_tortls_get_state_description(void *ignored) tls->ssl = SSL_new(ctx); tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization in HANDSHAKE"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR " in HANDSHAKE"); tls->state = TOR_TLS_ST_OPEN; tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization in OPEN"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR " in OPEN"); tls->state = TOR_TLS_ST_GOTCLOSE; tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization in GOTCLOSE"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR " in GOTCLOSE"); tls->state = TOR_TLS_ST_SENTCLOSE; tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization in SENTCLOSE"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR " in SENTCLOSE"); tls->state = TOR_TLS_ST_CLOSED; tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization in CLOSED"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR " in CLOSED"); tls->state = TOR_TLS_ST_RENEGOTIATE; tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization in RENEGOTIATE"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR " in RENEGOTIATE"); tls->state = TOR_TLS_ST_BUFFEREVENT; tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR); tls->state = 7; tor_tls_get_state_description(tls, buf, 200); - tt_str_op(buf, OP_EQ, "before/accept initialization in unknown TLS state"); + tt_str_op(buf, OP_EQ, SSL_STATE_STR " in unknown TLS state"); done: SSL_CTX_free(ctx); @@ -412,7 +415,7 @@ test_tortls_log_one_error(void *ignored) tor_tls_log_one_error(tls, 0, LOG_WARN, 0, NULL); tt_int_op(mock_saved_log_number(), OP_EQ, 1); tt_str_op(mock_saved_log_at(0), OP_EQ, "TLS error with 127.hello: (null)" - " (in (null):(null):before/accept initialization)\n"); + " (in (null):(null):" SSL_STATE_STR ")\n"); done: teardown_capture_of_logs(previous_log); -- cgit v1.2.3-54-g00ecf