diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-05-09 08:23:27 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-05-09 08:23:27 -0400 |
commit | e6d6347690d085dddb57d087a952750131b80758 (patch) | |
tree | 2614c7be4357cebe43b669eefe62a0904777406a /src/test | |
parent | 01d729cbfe88e8a77b7bd42434e32771402f3fe7 (diff) | |
parent | 89cafc4afac37ee3c9186f5c600cdf2fba1d7d1c (diff) | |
download | tor-e6d6347690d085dddb57d087a952750131b80758.tar.gz tor-e6d6347690d085dddb57d087a952750131b80758.zip |
Merge remote-tracking branch 'public/bug26005_034'
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/test_tortls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index ef1be139a6..ffa641ec41 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -205,7 +205,7 @@ test_tortls_tor_tls_get_error(void *data) static void library_init(void) { -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) +#ifdef OPENSSL_1_1_API OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL); #else SSL_library_init(); |