nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 19406: Fix the unit tests to work with OpenSSL 1.1.x

Browse Source 
Just as it says on the tin.  Don't need to fully disable any tests and
reduce coverage either.  Yay me.
This commit is contained in:
Yawning Angel 2016-06-14 06:24:13 +00:00 committed by Nick Mathewson
parent 6ddef1f7e0
commit c5e2f7b944
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/test_tortls.c
View File

@ -385,10 +385,12 @@ test_tortls_log_one_error(void *ignored)
LOG_WARN, 0, NULL); LOG_WARN, 0, NULL);
expect_log_severity(LOG_INFO); expect_log_severity(LOG_INFO);
#ifndef OPENSSL_1_1_API
mock_clean_saved_logs(); mock_clean_saved_logs();
tor_tls_log_one_error(tls, ERR_PACK(1, 2, SSL_R_RECORD_TOO_LARGE), tor_tls_log_one_error(tls, ERR_PACK(1, 2, SSL_R_RECORD_TOO_LARGE),
LOG_WARN, 0, NULL); LOG_WARN, 0, NULL);
expect_log_severity(LOG_INFO); expect_log_severity(LOG_INFO);
#endif
mock_clean_saved_logs(); mock_clean_saved_logs();
tor_tls_log_one_error(tls, ERR_PACK(1, 2, SSL_R_UNKNOWN_PROTOCOL), tor_tls_log_one_error(tls, ERR_PACK(1, 2, SSL_R_UNKNOWN_PROTOCOL),
@ -683,7 +685,7 @@ test_tortls_get_my_client_auth_key(void *ignored)
crypto_pk_t *ret; crypto_pk_t *ret;
crypto_pk_t *expected; crypto_pk_t *expected;
tor_tls_context_t *ctx; tor_tls_context_t *ctx;
RSA *k = tor_malloc_zero(sizeof(RSA)); RSA *k = RSA_new();
ctx = tor_malloc_zero(sizeof(tor_tls_context_t)); ctx = tor_malloc_zero(sizeof(tor_tls_context_t));
expected = crypto_new_pk_from_rsa_(k); expected = crypto_new_pk_from_rsa_(k);
@ -698,8 +700,8 @@ test_tortls_get_my_client_auth_key(void *ignored)
tt_assert(ret == expected); tt_assert(ret == expected);
done: done:
RSA_free(k);
tor_free(expected); tor_free(expected);
tor_free(k);
tor_free(ctx); tor_free(ctx);
} }