diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-14 12:17:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-14 12:17:24 -0400 |
| commit | df4fa92a88dbeadcc85ea28ac52af006e9e1466a (patch) | |
| tree | 860b5700c73de5a6702c8a4ebec0b7bd6bf86ed6 /src/test/test_tortls.c | |
| parent | a427a7c479d633ad74819729eb2412c5c5e9e97e (diff) | |
| parent | 71aacbe427e2d0c2b970bdc81db4f96c506dd7f3 (diff) | |
| download | tor-df4fa92a88dbeadcc85ea28ac52af006e9e1466a.tar.gz tor-df4fa92a88dbeadcc85ea28ac52af006e9e1466a.zip | |
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src/test/test_tortls.c')
| -rw-r--r-- | src/test/test_tortls.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 42b9ef7733..52be7d4e3a 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -381,10 +381,12 @@ test_tortls_log_one_error(void *ignored) LOG_WARN, 0, NULL); expect_log_severity(LOG_INFO); +#ifndef OPENSSL_1_1_API mock_clean_saved_logs(); tor_tls_log_one_error(tls, ERR_PACK(1, 2, SSL_R_RECORD_TOO_LARGE), LOG_WARN, 0, NULL); expect_log_severity(LOG_INFO); +#endif mock_clean_saved_logs(); tor_tls_log_one_error(tls, ERR_PACK(1, 2, SSL_R_UNKNOWN_PROTOCOL), @@ -679,7 +681,7 @@ test_tortls_get_my_client_auth_key(void *ignored) crypto_pk_t *ret; crypto_pk_t *expected; 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)); expected = crypto_new_pk_from_rsa_(k); @@ -694,8 +696,8 @@ test_tortls_get_my_client_auth_key(void *ignored) tt_assert(ret == expected); done: + RSA_free(k); tor_free(expected); - tor_free(k); tor_free(ctx); } |