tor-commits June 2018

tor-commits@lists.torproject.org

16 participants
2190 discussions

[tor/master] tiny comment and whitespace fixes
by arma＠torproject.org 21 Jun '18

21 Jun '18

commit 471418befb9d1b30b17acd1e07a9d3de034db261 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 21 13:07:51 2018 -0400 tiny comment and whitespace fixes --- src/or/relay.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index 8a97d72f9..f74c4b4a9 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1796,15 +1796,15 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, return 0; } - /* Don't allow the other endpoint to request more than our maximim - * (ie initial) stream SENDME window worth of data. Well-behaved + /* Don't allow the other endpoint to request more than our maximum + * (i.e. initial) stream SENDME window worth of data. Well-behaved * stock clients will not request more than this max (as per the check * in the while loop of connection_edge_consider_sending_sendme()). */ if (conn->package_window + STREAMWINDOW_INCREMENT > STREAMWINDOW_START_MAX) { static struct ratelim_t stream_warn_ratelim = RATELIM_INIT(600); - log_fn_ratelim(&stream_warn_ratelim,LOG_PROTOCOL_WARN, LD_PROTOCOL, + log_fn_ratelim(&stream_warn_ratelim, LOG_PROTOCOL_WARN, LD_PROTOCOL, "Unexpected stream sendme cell. Closing circ (window %d).", conn->package_window); return -END_CIRC_REASON_TORPROTOCOL;

1 0

[tor/master] Refactor makefiles to keep list of internal libraries in one place.
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit b2346b12019c45288bbae3bd009fe0bafe80ff58 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 10:34:29 2018 -0400 Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line. --- Makefile.am | 47 +++++++++++++++++++++++++++++++++++++++++++++ src/or/include.am | 10 ++-------- src/test/fuzz/include.am | 18 ++--------------- src/test/include.am | 50 +++++++++++++++--------------------------------- src/tools/include.am | 25 +++++++++++------------- 5 files changed, 77 insertions(+), 73 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3c10c7f95..579b9a089 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,6 +37,53 @@ else rust_ldadd= endif +# "Common" libraries used to link tor's utility code. +TOR_UTIL_LIBS = \ + src/common/libor.a \ + src/common/libor-ctime.a + +# Variants of the above for linking the testing variant of tor (for coverage +# and tests) +TOR_UTIL_TESTING_LIBS = \ + src/common/libor-testing.a \ + src/common/libor-ctime-testing.a + +# Internal crypto libraries used in Tor +TOR_CRYPTO_LIBS = \ + src/common/libor-crypto.a \ + $(LIBKECCAK_TINY) \ + $(LIBDONNA) + +# Variants of the above for linking the testing variant of tor (for coverage +# and tests) +TOR_CRYPTO_TESTING_LIBS = \ + src/common/libor-crypto-testing.a \ + $(LIBKECCAK_TINY) \ + $(LIBDONNA) + +# All static libraries used to link tor. +TOR_INTERNAL_LIBS = \ + src/or/libtor.a \ + $(TOR_CRYPTO_LIBS) \ + $(TOR_UTIL_LIBS) \ + src/common/libor-event.a \ + src/trunnel/libor-trunnel.a \ + src/trace/libor-trace.a + +# Variants of the above for linking the testing variant of tor (for coverage +# and tests) +TOR_INTERNAL_TESTING_LIBS = \ + src/or/libtor-testing.a \ + $(TOR_CRYPTO_TESTING_LIBS) \ + $(TOR_UTIL_TESTING_LIBS) \ + $(LIBKECCAK_TINY) \ + $(LIBDONNA) \ + src/common/libor-event-testing.a \ + src/trunnel/libor-trunnel-testing.a \ + src/trace/libor-trace.a + +# All libraries used to link tor-cov + include src/include.am include doc/include.am include contrib/include.am diff --git a/src/or/include.am b/src/or/include.am index 19bcaec65..3c54551d7 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -159,10 +159,7 @@ src_or_libtor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_or_tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ -src_or_tor_LDADD = src/or/libtor.a src/common/libor.a src/common/libor-ctime.a \ - src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \ - src/common/libor-event.a src/trunnel/libor-trunnel.a \ - src/trace/libor-trace.a \ +src_or_tor_LDADD = $(TOR_INTERNAL_LIBS) \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @@ -174,10 +171,7 @@ src_or_tor_cov_SOURCES = src/or/tor_main.c src_or_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_or_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_or_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ -src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ - src/common/libor-ctime-testing.a \ - src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \ - src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \ +src_or_tor_cov_LDADD = $(TOR_INTERNAL_TESTING_LIBS) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am index cd16dc05b..46f74ee82 100644 --- a/src/test/fuzz/include.am +++ b/src/test/fuzz/include.am @@ -7,14 +7,7 @@ FUZZING_CFLAGS = \ FUZZING_LDFLAG = \ @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ FUZZING_LIBS = \ - src/or/libtor-testing.a \ - src/common/libor-crypto-testing.a \ - $(LIBKECCAK_TINY) \ - $(LIBDONNA) \ - src/common/libor-testing.a \ - src/common/libor-ctime-testing.a \ - src/common/libor-event-testing.a \ - src/trunnel/libor-trunnel-testing.a \ + $(TOR_INTERNAL_TESTING_LIBS) \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @@ -24,14 +17,7 @@ FUZZING_LIBS = \ @TOR_ZSTD_LIBS@ oss-fuzz-prereqs: \ - src/or/libtor-testing.a \ - src/common/libor-crypto-testing.a \ - $(LIBKECCAK_TINY) \ - $(LIBDONNA) \ - src/common/libor-testing.a \ - src/common/libor-ctime-testing.a \ - src/common/libor-event-testing.a \ - src/trunnel/libor-trunnel-testing.a + $(TOR_INTERNAL_TESTING_LIBS) noinst_HEADERS += \ src/test/fuzz/fuzzing.h diff --git a/src/test/include.am b/src/test/include.am index 41c7848fa..0f0dc6a7f 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -220,8 +220,7 @@ src_test_test_switch_id_CPPFLAGS= $(src_test_AM_CPPFLAGS) src_test_test_switch_id_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_test_test_switch_id_LDFLAGS = @TOR_LDFLAGS_zlib@ src_test_test_switch_id_LDADD = \ - src/common/libor-testing.a \ - src/common/libor-ctime-testing.a \ + $(TOR_UTIL_TESTING_LIBS) \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ @TOR_LIB_WS32@ @TOR_LIB_USERENV@ \ @@ -229,15 +228,8 @@ src_test_test_switch_id_LDADD = \ src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ -src_test_test_LDADD = src/or/libtor-testing.a \ - src/common/libor-crypto-testing.a \ - $(LIBKECCAK_TINY) \ - $(LIBDONNA) \ - src/common/libor-testing.a \ - src/common/libor-ctime-testing.a \ - src/common/libor-event-testing.a \ - src/trunnel/libor-trunnel-testing.a \ - src/trace/libor-trace.a \ +src_test_test_LDADD = \ + $(TOR_INTERNAL_TESTING_LIBS) \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @@ -259,11 +251,8 @@ src_test_test_memwipe_LDFLAGS = $(src_test_test_LDFLAGS) @CFLAGS_BUGTRAP@ src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ -src_test_bench_LDADD = src/or/libtor.a src/common/libor.a \ - src/common/libor-ctime.a \ - src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \ - src/common/libor-event.a src/trunnel/libor-trunnel.a \ - src/trace/libor-trace.a \ +src_test_bench_LDADD = \ + $(TOR_INTERNAL_LIBS) \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @@ -272,12 +261,8 @@ src_test_bench_LDADD = src/or/libtor.a src/common/libor.a \ src_test_test_workqueue_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ -src_test_test_workqueue_LDADD = src/or/libtor-testing.a \ - src/common/libor-testing.a \ - src/common/libor-ctime-testing.a \ - src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \ - src/common/libor-event-testing.a \ - src/trace/libor-trace.a \ +src_test_test_workqueue_LDADD = \ + $(TOR_INTERNAL_TESTING_LIBS) \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @@ -287,10 +272,9 @@ src_test_test_workqueue_LDADD = src/or/libtor-testing.a \ src_test_test_timers_CPPFLAGS = $(src_test_test_CPPFLAGS) src_test_test_timers_CFLAGS = $(src_test_test_CFLAGS) src_test_test_timers_LDADD = \ - src/common/libor-testing.a \ - src/common/libor-ctime-testing.a \ src/common/libor-event-testing.a \ - src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \ + $(TOR_CRYPTO_TESTING_LIBS) \ + $(TOR_UTIL_TESTING_LIBS) \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @@ -319,10 +303,8 @@ noinst_PROGRAMS+= src/test/test-ntor-cl noinst_PROGRAMS+= src/test/test-hs-ntor-cl src_test_test_ntor_cl_SOURCES = src/test/test_ntor_cl.c src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ -src_test_test_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \ - src/common/libor-ctime.a \ - src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \ - src/trace/libor-trace.a \ +src_test_test_ntor_cl_LDADD = \ + $(TOR_INTERNAL_LIBS) \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @@ -332,9 +314,8 @@ src_test_test_ntor_cl_AM_CPPFLAGS = \ src_test_test_hs_ntor_cl_SOURCES = src/test/test_hs_ntor_cl.c src_test_test_hs_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ -src_test_test_hs_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \ - src/common/libor-ctime.a \ - src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \ +src_test_test_hs_ntor_cl_LDADD = \ + $(TOR_INTERNAL_LIBS) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ src_test_test_hs_ntor_cl_AM_CPPFLAGS = \ @@ -343,9 +324,8 @@ src_test_test_hs_ntor_cl_AM_CPPFLAGS = \ noinst_PROGRAMS += src/test/test-bt-cl src_test_test_bt_cl_SOURCES = src/test/test_bt_cl.c -src_test_test_bt_cl_LDADD = src/common/libor-testing.a \ - src/common/libor-ctime-testing.a \ - src/trace/libor-trace.a \ +src_test_test_bt_cl_LDADD = \ + $(TOR_UTIL_TESTING_LIBS) \ $(rust_ldadd) \ @TOR_LIB_MATH@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ diff --git a/src/tools/include.am b/src/tools/include.am index 016cf3b12..bbccb6d18 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -6,26 +6,25 @@ endif src_tools_tor_resolve_SOURCES = src/tools/tor-resolve.c src_tools_tor_resolve_LDFLAGS = -src_tools_tor_resolve_LDADD = src/common/libor.a \ - src/common/libor-ctime.a \ +src_tools_tor_resolve_LDADD = \ + $(TOR_UTIL_LIBS) \ $(rust_ldadd) \ - @TOR_LIB_MATH@ @TOR_LIB_WS32@ @TOR_LIB_USERENV@ + @TOR_LIB_MATH@ @TOR_LIB_WS32@ @TOR_LIB_USERENV@ if COVERAGE_ENABLED src_tools_tor_cov_resolve_SOURCES = src/tools/tor-resolve.c src_tools_tor_cov_resolve_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_tools_tor_cov_resolve_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) -src_tools_tor_cov_resolve_LDADD = src/common/libor-testing.a \ - src/common/libor-ctime-testing.a \ +src_tools_tor_cov_resolve_LDADD = \ + $(TOR_UTIL_TESTING_LIBS) \ @TOR_LIB_MATH@ @TOR_LIB_WS32@ endif src_tools_tor_gencert_SOURCES = src/tools/tor-gencert.c src_tools_tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ -src_tools_tor_gencert_LDADD = src/common/libor.a src/common/libor-crypto.a \ - src/common/libor-ctime.a \ - $(LIBKECCAK_TINY) \ - $(LIBDONNA) \ +src_tools_tor_gencert_LDADD = \ + $(TOR_CRYPTO_LIBS) \ + $(TOR_UTIL_LIBS) \ $(rust_ldadd) \ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ @@ -35,11 +34,9 @@ src_tools_tor_cov_gencert_SOURCES = src/tools/tor-gencert.c src_tools_tor_cov_gencert_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_tools_tor_cov_gencert_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_tools_tor_cov_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ -src_tools_tor_cov_gencert_LDADD = src/common/libor-testing.a \ - src/common/libor-crypto-testing.a \ - src/common/libor-ctime-testing.a \ - $(LIBKECCAK_TINY) \ - $(LIBDONNA) \ +src_tools_tor_cov_gencert_LDADD = \ + $(TOR_CRYPTO_TESTING_LIBS) \ + $(TOR_UTIL_TESTING_LIBS) \ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ endif

1 0

[tor/master] Rectify include paths (automated)
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 275aff6917260209dc53e553d895ec886f6c8c52 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 09:54:04 2018 -0400 Rectify include paths (automated) --- src/common/compat_time.c | 2 +- src/common/log.c | 2 +- src/common/sandbox.c | 4 ++-- src/common/util.c | 2 +- src/common/util.h | 2 +- src/common/util_bug.c | 2 +- src/lib/err/backtrace.c | 6 +++--- src/lib/err/torerr.c | 4 ++-- src/or/connection.c | 2 +- src/or/connection_edge.c | 2 +- src/or/directory.c | 2 +- src/or/main.c | 2 +- src/or/relay.c | 2 +- src/or/routerlist.c | 2 +- src/test/fuzz/fuzz_http.c | 2 +- src/test/fuzz/fuzz_http_connect.c | 2 +- src/test/fuzz/fuzzing_common.c | 2 +- src/test/test.c | 2 +- src/test/test_bt_cl.c | 2 +- src/test/test_logging.c | 2 +- src/test/testing_common.c | 2 +- 21 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/common/compat_time.c b/src/common/compat_time.c index 913fa666e..da323e55a 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -34,7 +34,7 @@ #include <mach/mach_time.h> #endif -#include "common/torerr.h" +#include "lib/err/torerr.h" #include "common/torlog.h" #include "common/util.h" #include "common/container.h" diff --git a/src/common/log.c b/src/common/log.c index 6dba5bf4b..928a3fba8 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -34,7 +34,7 @@ #define LOG_PRIVATE #include "common/torlog.h" #include "common/container.h" -#include "common/torerr.h" +#include "lib/err/torerr.h" #ifdef HAVE_ANDROID_LOG_H #include <android/log.h> diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 3679037f8..4fc132730 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -34,7 +34,7 @@ #include "common/sandbox.h" #include "common/container.h" -#include "common/torerr.h" +#include "lib/err/torerr.h" #include "common/torlog.h" #include "common/torint.h" #include "common/util.h" @@ -80,7 +80,7 @@ defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION) #define USE_BACKTRACE #define EXPOSE_CLEAN_BACKTRACE -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #endif /* defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && ... */ #ifdef USE_BACKTRACE diff --git a/src/common/util.c b/src/common/util.c index 664ab34d2..de46cc7c8 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -21,7 +21,7 @@ #include "common/container.h" #include "common/address.h" #include "common/sandbox.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "common/util_process.h" #include "common/util_format.h" diff --git a/src/common/util.h b/src/common/util.h index a5e6c4d46..8761e455f 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -22,7 +22,7 @@ /* for the correct alias to struct stat */ #include <sys/stat.h> #endif -#include "common/torerr.h" +#include "lib/err/torerr.h" #include "common/util_bug.h" #ifndef O_BINARY diff --git a/src/common/util_bug.c b/src/common/util_bug.c index da34201c1..5cfd00649 100644 --- a/src/common/util_bug.c +++ b/src/common/util_bug.c @@ -10,7 +10,7 @@ #include "orconfig.h" #include "common/util_bug.h" #include "common/torlog.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "common/container.h" #ifdef __COVERITY__ diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index d83cbba0e..cded6459f 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -14,7 +14,7 @@ */ #include "orconfig.h" -#include "common/torerr.h" +#include "lib/err/torerr.h" #ifdef HAVE_EXECINFO_H #include <execinfo.h> @@ -45,8 +45,8 @@ #endif #define EXPOSE_CLEAN_BACKTRACE -#include "common/backtrace.h" -#include "common/torerr.h" +#include "lib/err/backtrace.h" +#include "lib/err/torerr.h" #if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \ defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION) diff --git a/src/lib/err/torerr.c b/src/lib/err/torerr.c index 0e0c4db35..81f360596 100644 --- a/src/lib/err/torerr.c +++ b/src/lib/err/torerr.c @@ -28,8 +28,8 @@ #include <sys/types.h> #endif -#include "common/torerr.h" -#include "common/backtrace.h" +#include "lib/err/torerr.h" +#include "lib/err/backtrace.h" /** Array of fds to log crash-style warnings to. */ static int sigsafe_log_fds[TOR_SIGSAFE_LOG_MAX_FDS] = { STDERR_FILENO }; diff --git a/src/or/connection.c b/src/or/connection.c index 267719881..450903d6d 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -65,7 +65,7 @@ */ #define TOR_CHANNEL_INTERNAL_ #define CONNECTION_PRIVATE -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "or/channel.h" #include "or/channeltls.h" #include "or/circuitbuild.h" diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 125709786..6d6279c83 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -57,7 +57,7 @@ #include "or/or.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "or/addressmap.h" #include "common/buffers.h" diff --git a/src/or/directory.c b/src/or/directory.c index e008ac7f7..9918433f5 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -6,7 +6,7 @@ #define DIRECTORY_PRIVATE #include "or/or.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "or/bridges.h" #include "common/buffers.h" #include "or/circuitbuild.h" diff --git a/src/or/main.c b/src/or/main.c index b2856d3f8..4ca180af2 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -49,7 +49,7 @@ #define MAIN_PRIVATE #include "or/or.h" #include "or/addressmap.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "or/bridges.h" #include "common/buffers.h" #include "common/buffers_tls.h" diff --git a/src/or/relay.c b/src/or/relay.c index af03cd474..8a97d72f9 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -48,7 +48,7 @@ #define RELAY_PRIVATE #include "or/or.h" #include "or/addressmap.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "common/buffers.h" #include "or/channel.h" #include "or/circpathbias.h" diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 9ab01f4b3..9a6cf8c25 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -92,7 +92,7 @@ #define ROUTERLIST_PRIVATE #include "or/or.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "or/bridges.h" #include "common/crypto_ed25519.h" #include "or/circuitstats.h" diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c index a5be26df4..564edbb55 100644 --- a/src/test/fuzz/fuzz_http.c +++ b/src/test/fuzz/fuzz_http.c @@ -7,7 +7,7 @@ #define DIRECTORY_PRIVATE #include "or/or.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "common/buffers.h" #include "or/config.h" #include "or/connection.h" diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c index 664007502..1cde742f2 100644 --- a/src/test/fuzz/fuzz_http_connect.c +++ b/src/test/fuzz/fuzz_http_connect.c @@ -7,7 +7,7 @@ #define CONNECTION_EDGE_PRIVATE #include "or/or.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "common/buffers.h" #include "or/config.h" #include "or/connection.h" diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c index b2fc85a49..12ebd97bd 100644 --- a/src/test/fuzz/fuzzing_common.c +++ b/src/test/fuzz/fuzzing_common.c @@ -3,7 +3,7 @@ #define CRYPTO_ED25519_PRIVATE #include "orconfig.h" #include "or/or.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "or/config.h" #include "test/fuzz/fuzzing.h" #include "common/crypto.h" diff --git a/src/test/test.c b/src/test/test.c index 98f554b31..8bdeb60bd 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -40,7 +40,7 @@ long int lround(double x); double fabs(double x); #include "or/or.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "common/buffers.h" #include "or/circuitlist.h" #include "or/circuitstats.h" diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c index d2d167ac3..66dd931e5 100644 --- a/src/test/test_bt_cl.c +++ b/src/test/test_bt_cl.c @@ -9,7 +9,7 @@ #undef TOR_COVERAGE #include "or/or.h" #include "common/util.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "common/torlog.h" /* -1: no crash. diff --git a/src/test/test_logging.c b/src/test/test_logging.c index eaad7ed13..d31c70437 100644 --- a/src/test/test_logging.c +++ b/src/test/test_logging.c @@ -3,7 +3,7 @@ #include "orconfig.h" #include "or/or.h" -#include "common/torerr.h" +#include "lib/err/torerr.h" #include "common/torlog.h" #include "test/test.h" diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 8b83265d8..f9e60001d 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -15,7 +15,7 @@ #include "or/config.h" #include "common/crypto_rand.h" #include "or/rephist.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "test/test.h" #include "or/channelpadding.h" #include "or/main.h"

1 0

[tor/master] Move consttime library code into its own directory.
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit a403ee6bb31168e19cf4173fff0e9acf9548231f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 10:53:29 2018 -0400 Move consttime library code into its own directory. --- .gitignore | 2 ++ Makefile.am | 4 ++-- src/common/include.am | 23 ----------------------- src/include.am | 1 + src/{common => lib/ctime}/di_ops.c | 0 src/{common => lib/ctime}/di_ops.h | 0 src/lib/ctime/include.am | 25 +++++++++++++++++++++++++ src/rust/build.rs | 3 +-- 8 files changed, 31 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 517022399..6eb9530a9 100644 --- a/.gitignore +++ b/.gitignore @@ -167,6 +167,8 @@ uptime-*.json /src/ext/keccak-tiny/libkeccak-tiny.lib # /src/lib +/src/lib/libtor-ctime.a +/src/lib/libtor-ctime-testing.a /src/lib/libtor-err.a /src/lib/libtor-err-testing.a diff --git a/Makefile.am b/Makefile.am index 6c60de111..40ecfdae7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,14 +41,14 @@ endif TOR_UTIL_LIBS = \ src/common/libor.a \ src/lib/libtor-err.a \ - src/common/libor-ctime.a + src/lib/libtor-ctime.a # Variants of the above for linking the testing variant of tor (for coverage # and tests) TOR_UTIL_TESTING_LIBS = \ src/common/libor-testing.a \ src/lib/libtor-err-testing.a \ - src/common/libor-ctime-testing.a + src/lib/libtor-ctime-testing.a # Internal crypto libraries used in Tor TOR_CRYPTO_LIBS = \ diff --git a/src/common/include.am b/src/common/include.am index 533703486..fa12888ac 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -1,14 +1,12 @@ noinst_LIBRARIES += \ src/common/libor.a \ - src/common/libor-ctime.a \ src/common/libor-crypto.a \ src/common/libor-event.a if UNITTESTS_ENABLED noinst_LIBRARIES += \ src/common/libor-testing.a \ - src/common/libor-ctime-testing.a \ src/common/libor-crypto-testing.a \ src/common/libor-event-testing.a endif @@ -59,26 +57,6 @@ else readpassphrase_source= endif -if ADD_MULODI4 -mulodi4_source=src/ext/mulodi/mulodi4.c -else -mulodi4_source= -endif - -LIBOR_CTIME_A_SRC = \ - $(mulodi4_source) \ - src/ext/csiphash.c \ - src/common/di_ops.c - -src_common_libor_ctime_a_SOURCES = $(LIBOR_CTIME_A_SRC) -if UNITTESTS_ENABLED -src_common_libor_ctime_testing_a_SOURCES = $(LIBOR_CTIME_A_SRC) -else -src_common_libor_ctime_testing_a_SOURCES = -endif -src_common_libor_ctime_a_CFLAGS = @CFLAGS_CONSTTIME@ -src_common_libor_ctime_testing_a_CFLAGS = @CFLAGS_CONSTTIME@ $(TEST_CFLAGS) - LIBOR_A_SRC = \ src/common/address.c \ src/common/address_set.c \ @@ -189,7 +167,6 @@ COMMONHEADERS = \ src/common/crypto_rsa.h \ src/common/crypto_s2k.h \ src/common/crypto_util.h \ - src/common/di_ops.h \ src/common/handles.h \ src/common/memarea.h \ src/common/linux_syscalls.inc \ diff --git a/src/include.am b/src/include.am index 424481485..296ac19b1 100644 --- a/src/include.am +++ b/src/include.am @@ -1,5 +1,6 @@ include src/ext/include.am include src/lib/err/include.am +include src/lib/ctime/include.am include src/common/include.am include src/trunnel/include.am include src/or/include.am diff --git a/src/common/di_ops.c b/src/lib/ctime/di_ops.c similarity index 100% rename from src/common/di_ops.c rename to src/lib/ctime/di_ops.c diff --git a/src/common/di_ops.h b/src/lib/ctime/di_ops.h similarity index 100% rename from src/common/di_ops.h rename to src/lib/ctime/di_ops.h diff --git a/src/lib/ctime/include.am b/src/lib/ctime/include.am new file mode 100644 index 000000000..b46c43ba0 --- /dev/null +++ b/src/lib/ctime/include.am @@ -0,0 +1,25 @@ + +noinst_LIBRARIES += src/lib/libtor-ctime.a + +if UNITTESTS_ENABLED +noinst_LIBRARIES += src/lib/libtor-ctime-testing.a +endif + +if ADD_MULODI4 +mulodi4_source=src/ext/mulodi/mulodi4.c +else +mulodi4_source= +endif + +src_lib_libtor_ctime_a_SOURCES = \ + $(mulodi4_source) \ + src/ext/csiphash.c \ + src/lib/ctime/di_ops.c + +src_lib_libtor_ctime_testing_a_SOURCES = \ + $(src_lib_libtor_ctime_a_SOURCES) +src_lib_libtor_ctime_a_CFLAGS = @CFLAGS_CONSTTIME@ +src_lib_libtor_ctime_testing_a_CFLAGS = @CFLAGS_CONSTTIME@ $(TEST_CFLAGS) + +noinst_HEADERS += \ + src/lib/ctime/di_ops.h diff --git a/src/rust/build.rs b/src/rust/build.rs index 32000b12f..f9b40689f 100644 --- a/src/rust/build.rs +++ b/src/rust/build.rs @@ -150,11 +150,10 @@ pub fn main() { // tor uses. We must be careful with factoring and dependencies // moving forward! cfg.component("or-crypto-testing"); - cfg.component("or-ctime-testing"); cfg.component("or-testing"); cfg.component("tor-err-testing"); cfg.component("or-event-testing"); - cfg.component("or-ctime-testing"); + cfg.component("tor-ctime-testing"); cfg.component("curve25519_donna"); cfg.component("keccak-tiny"); cfg.component("ed25519_ref10");

1 0

[tor/master] Extract error functionality into a new lowest-level library.
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 2cfcb7b364541c27749ae0df73eabd7a56797f93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 09:53:08 2018 -0400 Extract error functionality into a new lowest-level library. --- .gitignore | 4 ++++ Makefile.am | 2 ++ src/common/include.am | 4 ---- src/include.am | 3 ++- src/{common => lib/err}/backtrace.c | 0 src/{common => lib/err}/backtrace.h | 0 src/lib/err/include.am | 17 +++++++++++++++++ src/{common => lib/err}/torerr.c | 0 src/{common => lib/err}/torerr.h | 0 src/rust/build.rs | 3 ++- 10 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b3b13694a..517022399 100644 --- a/.gitignore +++ b/.gitignore @@ -166,6 +166,10 @@ uptime-*.json /src/ext/keccak-tiny/libkeccak-tiny.a /src/ext/keccak-tiny/libkeccak-tiny.lib +# /src/lib +/src/lib/libtor-err.a +/src/lib/libtor-err-testing.a + # /src/or/ /src/or/Makefile /src/or/Makefile.in diff --git a/Makefile.am b/Makefile.am index 579b9a089..6c60de111 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,12 +40,14 @@ endif # "Common" libraries used to link tor's utility code. TOR_UTIL_LIBS = \ src/common/libor.a \ + src/lib/libtor-err.a \ src/common/libor-ctime.a # Variants of the above for linking the testing variant of tor (for coverage # and tests) TOR_UTIL_TESTING_LIBS = \ src/common/libor-testing.a \ + src/lib/libtor-err-testing.a \ src/common/libor-ctime-testing.a # Internal crypto libraries used in Tor diff --git a/src/common/include.am b/src/common/include.am index 8afec9c05..533703486 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -82,7 +82,6 @@ src_common_libor_ctime_testing_a_CFLAGS = @CFLAGS_CONSTTIME@ $(TEST_CFLAGS) LIBOR_A_SRC = \ src/common/address.c \ src/common/address_set.c \ - src/common/backtrace.c \ src/common/buffers.c \ src/common/compat.c \ src/common/compat_threads.c \ @@ -99,7 +98,6 @@ LIBOR_A_SRC = \ src/common/sandbox.c \ src/common/storagedir.c \ src/common/token_bucket.c \ - src/common/torerr.c \ src/common/workqueue.c \ $(libor_extra_source) \ $(threads_impl_source) \ @@ -161,7 +159,6 @@ src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) COMMONHEADERS = \ src/common/address.h \ src/common/address_set.h \ - src/common/backtrace.h \ src/common/buffers.h \ src/common/buffers_tls.h \ src/common/aes.h \ @@ -203,7 +200,6 @@ COMMONHEADERS = \ src/common/testsupport.h \ src/common/timers.h \ src/common/token_bucket.h \ - src/common/torerr.h \ src/common/torint.h \ src/common/torlog.h \ src/common/tortls.h \ diff --git a/src/include.am b/src/include.am index 90ecf90d4..424481485 100644 --- a/src/include.am +++ b/src/include.am @@ -1,6 +1,7 @@ include src/ext/include.am -include src/trunnel/include.am +include src/lib/err/include.am include src/common/include.am +include src/trunnel/include.am include src/or/include.am include src/rust/include.am include src/test/include.am diff --git a/src/common/backtrace.c b/src/lib/err/backtrace.c similarity index 100% rename from src/common/backtrace.c rename to src/lib/err/backtrace.c diff --git a/src/common/backtrace.h b/src/lib/err/backtrace.h similarity index 100% rename from src/common/backtrace.h rename to src/lib/err/backtrace.h diff --git a/src/lib/err/include.am b/src/lib/err/include.am new file mode 100644 index 000000000..257ba3004 --- /dev/null +++ b/src/lib/err/include.am @@ -0,0 +1,17 @@ + +noinst_LIBRARIES += src/lib/libtor-err.a + +if UNITTESTS_ENABLED +noinst_LIBRARIES += src/lib/libtor-err-testing.a +endif + +src_lib_libtor_err_a_SOURCES = \ + src/lib/err/backtrace.c \ + src/lib/err/torerr.c + +src_lib_libtor_err_testing_a_SOURCES = \ + $(src_lib_libtor_err_a_SOURCES) + +noinst_HEADERS += \ + src/lib/err/backtrace.h \ + src/lib/err/torerr.h diff --git a/src/common/torerr.c b/src/lib/err/torerr.c similarity index 100% rename from src/common/torerr.c rename to src/lib/err/torerr.c diff --git a/src/common/torerr.h b/src/lib/err/torerr.h similarity index 100% rename from src/common/torerr.h rename to src/lib/err/torerr.h diff --git a/src/rust/build.rs b/src/rust/build.rs index b943aa553..32000b12f 100644 --- a/src/rust/build.rs +++ b/src/rust/build.rs @@ -138,9 +138,9 @@ pub fn main() { cfg.from_cflags("TOR_LDFLAGS_openssl"); cfg.from_cflags("TOR_LDFLAGS_libevent"); + cfg.link_relpath("src/lib"); cfg.link_relpath("src/common"); cfg.link_relpath("src/ext/keccak-tiny"); - cfg.link_relpath("src/ext/keccak-tiny"); cfg.link_relpath("src/ext/ed25519/ref10"); cfg.link_relpath("src/ext/ed25519/donna"); cfg.link_relpath("src/trunnel"); @@ -152,6 +152,7 @@ pub fn main() { cfg.component("or-crypto-testing"); cfg.component("or-ctime-testing"); cfg.component("or-testing"); + cfg.component("tor-err-testing"); cfg.component("or-event-testing"); cfg.component("or-ctime-testing"); cfg.component("curve25519_donna");

1 0

[tor/master] Rectify include paths (automated)
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 727db7aeb9e3e4355b9a2fd065f2b7e52f1082b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 10:53:36 2018 -0400 Rectify include paths (automated) --- src/common/aes.c | 2 +- src/common/crypto_pwbox.c | 2 +- src/common/util.h | 2 +- src/ext/ed25519/ref10/crypto_verify_32.h | 2 +- src/lib/ctime/di_ops.c | 2 +- src/or/keypin.c | 2 +- src/or/onion_ntor.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/aes.c b/src/common/aes.c index bdefc2b55..70e48a74f 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -39,7 +39,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include "common/aes.h" #include "common/util.h" #include "common/torlog.h" -#include "common/di_ops.h" +#include "lib/ctime/di_ops.h" #ifdef ANDROID /* Android's OpenSSL seems to have removed all of its Engine support. */ diff --git a/src/common/crypto_pwbox.c b/src/common/crypto_pwbox.c index 5ffe138ee..799a8799e 100644 --- a/src/common/crypto_pwbox.c +++ b/src/common/crypto_pwbox.c @@ -14,7 +14,7 @@ #include "common/crypto_rand.h" #include "common/crypto_s2k.h" #include "common/crypto_util.h" -#include "common/di_ops.h" +#include "lib/ctime/di_ops.h" #include "common/util.h" #include "trunnel/pwbox.h" diff --git a/src/common/util.h b/src/common/util.h index 8761e455f..b3c17db24 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -14,7 +14,7 @@ #include "orconfig.h" #include "common/torint.h" #include "common/compat.h" -#include "common/di_ops.h" +#include "lib/ctime/di_ops.h" #include "common/testsupport.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/ext/ed25519/ref10/crypto_verify_32.h b/src/ext/ed25519/ref10/crypto_verify_32.h index f2000a321..529992875 100644 --- a/src/ext/ed25519/ref10/crypto_verify_32.h +++ b/src/ext/ed25519/ref10/crypto_verify_32.h @@ -1,4 +1,4 @@ /* Added for Tor. */ -#include "common/di_ops.h" +#include "lib/ctime/di_ops.h" #define crypto_verify_32(a,b) \ (! tor_memeq((a), (b), 32)) diff --git a/src/lib/ctime/di_ops.c b/src/lib/ctime/di_ops.c index 1ff1988b1..cc76be548 100644 --- a/src/lib/ctime/di_ops.c +++ b/src/lib/ctime/di_ops.c @@ -7,7 +7,7 @@ **/ #include "orconfig.h" -#include "common/di_ops.h" +#include "lib/ctime/di_ops.h" #include "common/torlog.h" #include "common/util.h" diff --git a/src/or/keypin.c b/src/or/keypin.c index 402646028..921a401a4 100644 --- a/src/or/keypin.c +++ b/src/or/keypin.c @@ -14,7 +14,7 @@ #include "common/compat.h" #include "common/crypto_digest.h" #include "common/crypto_format.h" -#include "common/di_ops.h" +#include "lib/ctime/di_ops.h" #include "ht.h" #include "or/keypin.h" #include "siphash.h" diff --git a/src/or/onion_ntor.h b/src/or/onion_ntor.h index 3acb1eb62..13a3298ac 100644 --- a/src/or/onion_ntor.h +++ b/src/or/onion_ntor.h @@ -6,7 +6,7 @@ #include "common/torint.h" #include "common/crypto_curve25519.h" -#include "common/di_ops.h" +#include "lib/ctime/di_ops.h" /** State to be maintained by a client between sending an ntor onionskin * and receiving a reply. */

1 0

[tor/master] Rename libtor.a to libtor-app.a
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit ad7776f66d3e914a0842c20f31162c0e11befa34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 11:01:10 2018 -0400 Rename libtor.a to libtor-app.a --- .gitignore | 4 ++-- Makefile.am | 4 ++-- src/or/include.am | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 6eb9530a9..2267f5b4f 100644 --- a/.gitignore +++ b/.gitignore @@ -179,8 +179,8 @@ uptime-*.json /src/or/tor.exe /src/or/tor-cov /src/or/tor-cov.exe -/src/or/libtor.a -/src/or/libtor-testing.a +/src/or/libtor-app.a +/src/or/libtor-app-testing.a /src/or/libtor.lib # /src/rust diff --git a/Makefile.am b/Makefile.am index 40ecfdae7..59230ab75 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,7 +65,7 @@ TOR_CRYPTO_TESTING_LIBS = \ # All static libraries used to link tor. TOR_INTERNAL_LIBS = \ - src/or/libtor.a \ + src/or/libtor-app.a \ $(TOR_CRYPTO_LIBS) \ $(TOR_UTIL_LIBS) \ src/common/libor-event.a \ @@ -75,7 +75,7 @@ TOR_INTERNAL_LIBS = \ # Variants of the above for linking the testing variant of tor (for coverage # and tests) TOR_INTERNAL_TESTING_LIBS = \ - src/or/libtor-testing.a \ + src/or/libtor-app-testing.a \ $(TOR_CRYPTO_TESTING_LIBS) \ $(TOR_UTIL_TESTING_LIBS) \ $(LIBKECCAK_TINY) \ diff --git a/src/or/include.am b/src/or/include.am index 3c54551d7..a2532cd4d 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -1,9 +1,9 @@ bin_PROGRAMS+= src/or/tor noinst_LIBRARIES += \ - src/or/libtor.a + src/or/libtor-app.a if UNITTESTS_ENABLED noinst_LIBRARIES += \ - src/or/libtor-testing.a + src/or/libtor-app-testing.a endif if COVERAGE_ENABLED noinst_PROGRAMS+= src/or/tor-cov @@ -17,7 +17,7 @@ endif EXTRA_DIST+= src/or/ntmain.c src/or/Makefile.nmake -LIBTOR_A_SOURCES = \ +LIBTOR_APP_A_SOURCES = \ src/or/addressmap.c \ src/or/bridges.c \ src/or/channel.c \ @@ -118,7 +118,7 @@ LIBTOR_A_SOURCES = \ # source files of every module to libtor-testing.a so we can build the unit # tests for everything. See the UNITTESTS_ENABLED branch below. # -LIBTOR_TESTING_A_SOURCES = $(LIBTOR_A_SOURCES) +LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES) # The Directory Authority module. MODULE_DIRAUTH_SOURCES = \ @@ -127,18 +127,18 @@ MODULE_DIRAUTH_SOURCES = \ src/or/dirauth/shared_random.c \ src/or/dirauth/shared_random_state.c if BUILD_MODULE_DIRAUTH -LIBTOR_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) +LIBTOR_APP_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) endif -src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES) +src_or_libtor_app_a_SOURCES = $(LIBTOR_APP_A_SOURCES) if UNITTESTS_ENABLED # Add the sources of the modules that are needed for tests to work here. -LIBTOR_TESTING_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) +LIBTOR_APP_TESTING_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) -src_or_libtor_testing_a_SOURCES = $(LIBTOR_TESTING_A_SOURCES) +src_or_libtor_app_testing_a_SOURCES = $(LIBTOR_APP_TESTING_A_SOURCES) else -src_or_libtor_testing_a_SOURCES = +src_or_libtor_app_testing_a_SOURCES = endif src_or_tor_SOURCES = src/or/tor_main.c @@ -150,8 +150,8 @@ AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ -DLOCALSTATEDIR="\"$(localstatedir)\"" \ -DBINDIR="\"$(bindir)\"" -src_or_libtor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) -src_or_libtor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) +src_or_libtor_app_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_or_libtor_app_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # -L flags need to go in LDFLAGS. -l flags need to go in LDADD. # This seems to matter nowhere but on windows, but I assure you that it

1 0

[tor-browser-build/master] Bug 26440: move vaulted vars to a separate directory
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 2baf11975323cffae6a993fb5a2f57236f7c880d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 21 16:27:50 2018 +0200 Bug 26440: move vaulted vars to a separate directory --- tools/ansible/boklm-tbb-nightly-build.yml | 2 ++ .../ansible/{group_vars => vaulted_vars}/boklm-tbb-nightly/dma-auth.yml | 0 2 files changed, 2 insertions(+) diff --git a/tools/ansible/boklm-tbb-nightly-build.yml b/tools/ansible/boklm-tbb-nightly-build.yml index 2fe48cd..dd9e1dc 100644 --- a/tools/ansible/boklm-tbb-nightly-build.yml +++ b/tools/ansible/boklm-tbb-nightly-build.yml @@ -6,3 +6,5 @@ - role: tbb-nightly-build - role: unattended-upgrades - role: mta + vars_files: + - vaulted_vars/boklm-tbb-nightly/dma-auth.yml diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml b/tools/ansible/vaulted_vars/boklm-tbb-nightly/dma-auth.yml similarity index 100% rename from tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml rename to tools/ansible/vaulted_vars/boklm-tbb-nightly/dma-auth.yml

1 0

[tor-browser-build/master] Bug 23384: Add user sukhbir on build-sunet-a.torproject.net
by boklm＠torproject.org 21 Jun '18

21 Jun '18

commit 9638ce481f00edd72e5f307cde29978e66a5d24f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 21 15:50:27 2018 +0200 Bug 23384: Add user sukhbir on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/files/sukhbir.pub | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index 1445fce..8bf2e66 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -6,3 +6,4 @@ tbb_team_members: - gk - mcs - mikeperry + - sukhbir diff --git a/tools/ansible/roles/tbb-team/files/sukhbir.pub b/tools/ansible/roles/tbb-team/files/sukhbir.pub new file mode 100644 index 0000000..3277487 --- /dev/null +++ b/tools/ansible/roles/tbb-team/files/sukhbir.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCs5gQrS9m8H4qiR+Q0BT85jIHFgSb3ns2l1M1JWgWyI5eZvXCxIq1G9xI+HOp86mHA2XX7uWSCKWiWM1lt4UnM4jHm5thC2MEsKVqHaHF7s+lXq2uhybUma2fxXdYc9AM/TxujKKJ6U5qIkqLsX3HF5tQtEKY2lgPXgXNpldfX/IhtBWOfmRGTH5iu1hBIhhMAz31lTcYR4AOpcSeeMGRhYEka5RrH492OLfCVxphtlRtXm4CtAL4NpNe/cMZnntqprJJAjRJC71gU3OpT5a2zKKctN/5wTwAWpR1URXrQK4Mu37angYhjR/698iTJVAv2XxEgkB+NUCse98cIMUj5 sukhbir.in(a)gmail.com

1 0

[tor/master] Rectify include paths (automated)
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit da728e36f45799077a8d24a0be95ab5db78593f4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 21 09:55:16 2018 -0400 Rectify include paths (automated) --- src/common/crypto_hkdf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/crypto_hkdf.c b/src/common/crypto_hkdf.c index dd29c73ce..8dc15b6ff 100644 --- a/src/common/crypto_hkdf.c +++ b/src/common/crypto_hkdf.c @@ -13,7 +13,7 @@ #include "common/crypto_util.h" #include "common/crypto_digest.h" -#include "crypto_openssl_mgt.h" +#include "common/crypto_openssl_mgt.h" #include <openssl/opensslv.h> #if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2018