Fredrik Fornwall
6 years ago
6 changed files with 33 additions and 59 deletions
@ -1,14 +0,0 @@ |
|||
diff -u -r ../tor-0.3.4.8/src/common/compat_openssl.h ./src/common/compat_openssl.h
|
|||
--- ../tor-0.3.4.8/src/common/compat_openssl.h 2018-06-15 21:20:53.000000000 +0000
|
|||
+++ ./src/common/compat_openssl.h 2018-09-12 04:22:24.387770893 +0000
|
|||
@@ -28,10 +28,6 @@
|
|||
#define OPENSSL_1_1_API |
|||
#endif /* OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) && ... */ |
|||
|
|||
-#ifndef OPENSSL_VERSION
|
|||
-#define OPENSSL_VERSION SSLEAY_VERSION
|
|||
-#endif
|
|||
-
|
|||
#ifndef OPENSSL_1_1_API |
|||
#define OpenSSL_version(v) SSLeay_version(v) |
|||
#define OpenSSL_version_num() SSLeay() |
@ -1,13 +0,0 @@ |
|||
diff -u -r ../tor-0.3.3.9/src/common/crypto_openssl_mgt.h ./src/common/crypto_openssl_mgt.h
|
|||
--- ../tor-0.3.3.9/src/common/crypto_openssl_mgt.h 2018-07-13 18:25:23.000000000 +0000
|
|||
+++ ./src/common/crypto_openssl_mgt.h 2018-08-23 22:30:55.658879513 +0000
|
|||
@@ -50,8 +50,7 @@
|
|||
#define OPENSSL_V_SERIES(a,b,c) \ |
|||
OPENSSL_VER((a),(b),(c),0,0) |
|||
|
|||
-#ifdef ANDROID
|
|||
-/* Android's OpenSSL seems to have removed all of its Engine support. */
|
|||
+#ifdef OPENSSL_NO_ENGINE
|
|||
#define DISABLE_ENGINES |
|||
#endif |
|||
|
@ -1,11 +0,0 @@ |
|||
diff -u -r ../tor-0.3.4.8/src/common/crypto_rand.c ./src/common/crypto_rand.c
|
|||
--- ../tor-0.3.4.8/src/common/crypto_rand.c 2018-06-15 21:20:53.000000000 +0000
|
|||
+++ ./src/common/crypto_rand.c 2018-09-12 04:25:23.741656806 +0000
|
|||
@@ -33,6 +33,7 @@
|
|||
|
|||
DISABLE_GCC_WARNING(redundant-decls) |
|||
#include <openssl/rand.h> |
|||
+#include <openssl/sha.h>
|
|||
ENABLE_GCC_WARNING(redundant-decls) |
|||
|
|||
#if __GNUC__ && GCC_VERSION >= 402 |
@ -0,0 +1,24 @@ |
|||
diff -u -r ../tor-0.3.5.7/src/feature/relay/dns.c ./src/feature/relay/dns.c
|
|||
--- ../tor-0.3.5.7/src/feature/relay/dns.c 2019-01-04 02:34:43.000000000 +0000
|
|||
+++ ./src/feature/relay/dns.c 2019-01-10 20:30:51.361418430 +0000
|
|||
@@ -1377,7 +1377,7 @@
|
|||
conf_fname = options->ServerDNSResolvConfFile; |
|||
#ifndef _WIN32 |
|||
if (!conf_fname) |
|||
- conf_fname = "/etc/resolv.conf";
|
|||
+ conf_fname = "@TERMUX_PREFIX@/etc/resolv.conf";
|
|||
#endif |
|||
flags = DNS_OPTIONS_ALL; |
|||
|
|||
@@ -1408,9 +1408,9 @@
|
|||
#if defined(DNS_OPTION_HOSTSFILE) && defined(USE_LIBSECCOMP) |
|||
if (flags & DNS_OPTION_HOSTSFILE) { |
|||
flags ^= DNS_OPTION_HOSTSFILE; |
|||
- log_debug(LD_FS, "Loading /etc/hosts");
|
|||
+ log_debug(LD_FS, "Loading @TERMUX_PREFIX@/etc/hosts");
|
|||
evdns_base_load_hosts(the_evdns_base, |
|||
- sandbox_intern_string("/etc/hosts"));
|
|||
+ sandbox_intern_string("@TERMUX_PREFIX@/etc/hosts"));
|
|||
} |
|||
#endif /* defined(DNS_OPTION_HOSTSFILE) && defined(USE_LIBSECCOMP) */ |
|||
log_info(LD_EXIT, "Parsing resolver configuration in '%s'", conf_fname); |
Loading…
Reference in new issue