January 2019 - tor-commits - lists.torproject.org

[tor/master] Dir: when Tor's clock is behind, use a future consensus to bootstrap
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit 7a45bc74a430ff64f0696c77f075f9c830822413 Author: teor <teor(a)torproject.org> Date: Thu Nov 29 00:46:39 2018 +1000 Dir: when Tor's clock is behind, use a future consensus to bootstrap When Tor's clock is behind the clocks on the authorities, allow Tor to bootstrap successfully. Fixes bug 28591; bugfix on 0.2.0.9-alpha. --- changes/bug28591 | 4 ++++ src/feature/nodelist/microdesc.c | 10 ++++++---- src/feature/nodelist/networkstatus.c | 35 ++++++++++++++++++++++++----------- src/feature/nodelist/networkstatus.h | 2 ++ src/test/test_entrynodes.c | 32 ++++++++++++++++++++++---------- src/test/test_routerlist.c | 1 - 6 files changed, 58 insertions(+), 26 deletions(-) diff --git a/changes/bug28591 b/changes/bug28591 new file mode 100644 index 000000000..3a1c96ac1 --- /dev/null +++ b/changes/bug28591 @@ -0,0 +1,4 @@ + o Minor bugfixes (client, bootstrap): + - When Tor's clock is behind the clocks on the authorities, allow Tor to + bootstrap successfully. Fixes bug 28591; bugfix on 0.2.0.9-alpha. + diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c index 3f5085412..8c5a9ee61 100644 --- a/src/feature/nodelist/microdesc.c +++ b/src/feature/nodelist/microdesc.c @@ -110,8 +110,9 @@ microdesc_note_outdated_dirserver(const char *relay_digest) /* If we have a reasonably live consensus, then most of our dirservers should * still be caching all the microdescriptors in it. Reasonably live - * consensuses are up to a day old. But microdescriptors expire 7 days after - * the last consensus that referenced them. */ + * consensuses are up to a day old (or a day in the future). But + * microdescriptors expire 7 days after the last consensus that referenced + * them. */ if (!networkstatus_get_reasonably_live_consensus(approx_time(), FLAV_MICRODESC)) { return; @@ -544,8 +545,8 @@ microdesc_cache_clean(microdesc_cache_t *cache, time_t cutoff, int force) size_t bytes_dropped = 0; time_t now = time(NULL); - /* If we don't know a live consensus, don't believe last_listed values: we - * might be starting up after being down for a while. */ + /* If we don't know a reasonably live consensus, don't believe last_listed + * values: we might be starting up after being down for a while. */ if (! force && ! networkstatus_get_reasonably_live_consensus(now, FLAV_MICRODESC)) return; @@ -973,6 +974,7 @@ update_microdesc_downloads(time_t now) if (directory_too_idle_to_fetch_descriptors(options, now)) return; + /* Give up if we don't have a reasonably live consensus. */ consensus = networkstatus_get_reasonably_live_consensus(now, FLAV_MICRODESC); if (!consensus) return; diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 51e720a98..a40c3dfb2 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -1377,7 +1377,7 @@ networkstatus_get_dl_status_by_flavor_running,(consensus_flavor_t flavor)) } /** Return the most recent consensus that we have downloaded, or NULL if we - * don't have one. */ + * don't have one. May return future or expired consensuses. */ MOCK_IMPL(networkstatus_t *, networkstatus_get_latest_consensus,(void)) { @@ -1388,7 +1388,7 @@ networkstatus_get_latest_consensus,(void)) } /** Return the latest consensus we have whose flavor matches f, or NULL - * if we don't have one. */ + * if we don't have one. May return future or expired consensuses. */ MOCK_IMPL(networkstatus_t *, networkstatus_get_latest_consensus_by_flavor,(consensus_flavor_t f)) { @@ -1422,10 +1422,11 @@ networkstatus_is_live(const networkstatus_t *ns, time_t now) return (ns->valid_after <= now && now <= ns->valid_until); } -/** Determine if consensus is valid or expired recently enough that - * we can still use it. +/** Determine if consensus is valid, or expired recently enough, or not + * too far in the future, so that we can still use it. * - * Return 1 if the consensus is reasonably live, or 0 if it is too old. + * Return 1 if the consensus is reasonably live, or 0 if it is too old or + * too new. */ int networkstatus_consensus_reasonably_live(const networkstatus_t *consensus, @@ -1434,29 +1435,42 @@ networkstatus_consensus_reasonably_live(const networkstatus_t *consensus, if (BUG(!consensus)) return 0; - return networkstatus_valid_until_is_reasonably_live(consensus->valid_until, + return networkstatus_valid_after_is_reasonably_live(consensus->valid_after, + now) && + networkstatus_valid_until_is_reasonably_live(consensus->valid_until, now); } +#define REASONABLY_LIVE_TIME (24*60*60) + +/** As networkstatus_consensus_reasonably_live, but takes a valid_after + * time, and checks to see if it is in the past, or not too far in the future. + */ +int +networkstatus_valid_after_is_reasonably_live(time_t valid_after, + time_t now) +{ + return (now >= valid_after - REASONABLY_LIVE_TIME); +} + /** As networkstatus_consensus_reasonably_live, but takes a valid_until - * time rather than an entire consensus. */ + * time, and checks to see if it is in the future, or not too far in the past. + */ int networkstatus_valid_until_is_reasonably_live(time_t valid_until, time_t now) { -#define REASONABLY_LIVE_TIME (24*60*60) return (now <= valid_until + REASONABLY_LIVE_TIME); } /** As networkstatus_get_live_consensus(), but is way more tolerant of expired - * consensuses. */ + * and future consensuses. */ MOCK_IMPL(networkstatus_t *, networkstatus_get_reasonably_live_consensus,(time_t now, int flavor)) { networkstatus_t *consensus = networkstatus_get_latest_consensus_by_flavor(flavor); if (consensus && - consensus->valid_after <= now && networkstatus_consensus_reasonably_live(consensus, now)) return consensus; else @@ -2082,7 +2096,6 @@ networkstatus_set_current_consensus(const char *consensus, nodelist_set_consensus(c); - /* XXXXNM Microdescs: needs a non-ns variant. ???? NM*/ update_consensus_networkstatus_fetch_time(now); /* Change the cell EWMA settings */ diff --git a/src/feature/nodelist/networkstatus.h b/src/feature/nodelist/networkstatus.h index 7b1a0ff72..6f1d15d53 100644 --- a/src/feature/nodelist/networkstatus.h +++ b/src/feature/nodelist/networkstatus.h @@ -87,6 +87,8 @@ MOCK_DECL(networkstatus_t *, networkstatus_get_live_consensus,(time_t now)); int networkstatus_is_live(const networkstatus_t *ns, time_t now); int networkstatus_consensus_reasonably_live(const networkstatus_t *consensus, time_t now); +int networkstatus_valid_after_is_reasonably_live(time_t valid_after, + time_t now); int networkstatus_valid_until_is_reasonably_live(time_t valid_until, time_t now); MOCK_DECL(networkstatus_t *,networkstatus_get_reasonably_live_consensus, diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 52b87a84a..348c642a2 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -127,6 +127,9 @@ big_fake_network_cleanup(const struct testcase_t *testcase, void *ptr) return 1; /* NOP */ } +#define REASONABLY_FUTURE " reasonably-future" +#define REASONABLY_PAST " reasonably-past" + /* Unittest setup function: Setup a fake network. */ static void * big_fake_network_setup(const struct testcase_t *testcase) @@ -138,9 +141,10 @@ big_fake_network_setup(const struct testcase_t *testcase) const int N_NODES = 271; const char *argument = testcase->setup_data; - int reasonably_live_consensus = 0; + int reasonably_future_consensus = 0, reasonably_past_consensus = 0; if (argument) { - reasonably_live_consensus = strstr(argument, "reasonably-live") != NULL; + reasonably_future_consensus = strstr(argument, REASONABLY_FUTURE) != NULL; + reasonably_past_consensus = strstr(argument, REASONABLY_PAST) != NULL; } big_fake_net_nodes = smartlist_new(); @@ -198,11 +202,15 @@ big_fake_network_setup(const struct testcase_t *testcase) dummy_state = tor_malloc_zero(sizeof(or_state_t)); dummy_consensus = tor_malloc_zero(sizeof(networkstatus_t)); - if (reasonably_live_consensus) { - /* Make the dummy consensus valid from 4 hours ago, but expired an hour + if (reasonably_future_consensus) { + /* Make the dummy consensus valid in 6 hours, and expiring in 7 hours. */ + dummy_consensus->valid_after = approx_time() + 6*3600; + dummy_consensus->valid_until = approx_time() + 7*3600; + } else if (reasonably_past_consensus) { + /* Make the dummy consensus valid from 16 hours ago, but expired 12 hours * ago. */ - dummy_consensus->valid_after = approx_time() - 4*3600; - dummy_consensus->valid_until = approx_time() - 3600; + dummy_consensus->valid_after = approx_time() - 16*3600; + dummy_consensus->valid_until = approx_time() - 12*3600; } else { /* Make the dummy consensus valid for an hour either side of now. */ dummy_consensus->valid_after = approx_time() - 3600; @@ -3035,13 +3043,17 @@ static const struct testcase_setup_t upgrade_circuits = { #define BFN_TEST(name) \ EN_TEST_BASE(name, TT_FORK, &big_fake_network, NULL), \ - { #name "_reasonably_live", test_entry_guard_ ## name, TT_FORK, \ - &big_fake_network, (void*)("reasonably-live") } + { #name "_reasonably_future", test_entry_guard_ ## name, TT_FORK, \ + &big_fake_network, (void*)(REASONABLY_FUTURE) }, \ + { #name "_reasonably_past", test_entry_guard_ ## name, TT_FORK, \ + &big_fake_network, (void*)(REASONABLY_PAST) } #define UPGRADE_TEST(name, arg) \ EN_TEST_BASE(name, TT_FORK, &upgrade_circuits, arg), \ - { #name "_reasonably_live", test_entry_guard_ ## name, TT_FORK, \ - &upgrade_circuits, (void*)(arg " reasonably-live") } + { #name "_reasonably_future", test_entry_guard_ ## name, TT_FORK, \ + &upgrade_circuits, (void*)(arg REASONABLY_FUTURE) }, \ + { #name "_reasonably_past", test_entry_guard_ ## name, TT_FORK, \ + &upgrade_circuits, (void*)(arg REASONABLY_PAST) } struct testcase_t entrynodes_tests[] = { NO_PREFIX_TEST(node_preferred_orport), diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index 67af2fd48..6ba4877b9 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -301,7 +301,6 @@ test_router_pick_directory_server_impl(void *arg) tt_assert(!networkstatus_consensus_is_bootstrapping(con_md->valid_until + 24*60*60)); /* These times are outside the test validity period */ - tt_assert(networkstatus_consensus_is_bootstrapping(now)); tt_assert(networkstatus_consensus_is_bootstrapping(now + 2*24*60*60)); tt_assert(networkstatus_consensus_is_bootstrapping(now - 2*24*60*60));

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 09 Jan '19

09 Jan '19

commit 971ace0a2d2ddd7a64301da5a8b5ebbac2c72346 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 9 14:15:59 2019 +0000 Update translations for https_everywhere_completed --- ka/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/https-everywhere.dtd b/ka/https-everywhere.dtd index be46806db..67992ec64 100644 --- a/ka/https-everywhere.dtd +++ b/ka/https-everywhere.dtd @@ -8,7 +8,7 @@ <!ENTITY https-everywhere.menu.donate_eff_imperative "შემოწირულობა EFF-სთვის"> <!ENTITY https-everywhere.menu.observatory "SSL Observatory პარამეტრები"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere-ის ჩართვა"> -<!ENTITY https-everywhere.menu.blockUnencryptedRequests "ყველა დაუშიფრავი მოთხოვნის შეზღუდვა"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "ყველა შესაბამისი საიტის დაშიფვრა (EASE)"> <!ENTITY https-everywhere.menu.showCounter "მთვლელის ჩვენება"> <!ENTITY https-everywhere.menu.viewAllRules "წესების ნახვა ">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 09 Jan '19

09 Jan '19

commit 85ad1f3cab20d049f80686b0518e4e80307badf9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 9 14:15:52 2019 +0000 Update translations for https_everywhere --- ka/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/https-everywhere.dtd b/ka/https-everywhere.dtd index d58183415..67992ec64 100644 --- a/ka/https-everywhere.dtd +++ b/ka/https-everywhere.dtd @@ -8,7 +8,7 @@ <!ENTITY https-everywhere.menu.donate_eff_imperative "შემოწირულობა EFF-სთვის"> <!ENTITY https-everywhere.menu.observatory "SSL Observatory პარამეტრები"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere-ის ჩართვა"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Encrypt All Sites Eligible (EASE)"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "ყველა შესაბამისი საიტის დაშიფვრა (EASE)"> <!ENTITY https-everywhere.menu.showCounter "მთვლელის ჩვენება"> <!ENTITY https-everywhere.menu.viewAllRules "წესების ნახვა ">

1 0

[tor/maint-0.3.5] Fix (and make consistent) the use of OpenBSD preprocessor macro tests
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit c13a81f7f96a6433709b90c343d358c93cc7b9f8 Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Sun Dec 23 14:51:45 2018 -0600 Fix (and make consistent) the use of OpenBSD preprocessor macro tests Prior to this commit, the testsuite was failing on OpenBSD. After this commit the testsuite runs fine on OpenBSD. It was previously decided to test for the OpenBSD macro (rather than __OpenBSD__, etc.) because OpenBSD forks seem to have the former macro defined. sys/param.h must be included for the OpenBSD macro definition; however, many files tested for the OpenBSD macro without having this header included. This commit includes sys/param.h in the files where the OpenBSD macro is used (and sys/param.h is not already included), and it also changes some instances of the __OpenBSD__ macro to OpenBSD. See commit 27df23abb675ffeb198bf0c1cc85c4baed77a988 which changed everything to use OpenBSD instead of __OpenBSD__ or OPENBSD. See also tickets #6982 and #20980 (the latter ticket is where it was decided to use the OpenBSD macro). Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- src/app/config/config.c | 3 +++ src/core/or/connection_edge.c | 3 +++ src/ext/byteorder.h | 4 ++++ src/ext/ed25519/donna/ed25519-donna-portable-identify.h | 2 +- src/ext/trunnel/trunnel.c | 6 +++++- src/lib/err/backtrace.c | 3 +++ src/lib/net/inaddr_st.h | 5 ++++- src/test/test-memwipe.c | 4 ++++ src/test/test_options.c | 4 ++++ 9 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 4a8f94da0..c71ed0184 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -131,6 +131,9 @@ #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 58aefcf8f..2ec83c120 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -139,6 +139,9 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H) #include <net/if.h> diff --git a/src/ext/byteorder.h b/src/ext/byteorder.h index c8ba52184..95e080b14 100644 --- a/src/ext/byteorder.h +++ b/src/ext/byteorder.h @@ -29,6 +29,10 @@ Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c) */ +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + /* This code is extracted from csiphash.h */ #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ diff --git a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h index 26a264cf9..3e0f9cfc5 100644 --- a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h +++ b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h @@ -14,7 +14,7 @@ #define OS_OSX #elif defined(macintosh) || defined(Macintosh) #define OS_MAC - #elif defined(__OpenBSD__) + #elif defined(OpenBSD) #define OS_OPENBSD #endif #endif diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c index b749d8136..2442bc390 100644 --- a/src/ext/trunnel/trunnel.c +++ b/src/ext/trunnel/trunnel.c @@ -14,6 +14,10 @@ #include <stdlib.h> #include <string.h> +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ # define IS_LITTLE_ENDIAN 1 @@ -31,7 +35,7 @@ # define IS_LITTLE_ENDIAN # endif #else -# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) # include <sys/endian.h> # else # include <endian.h> diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index d18a595c3..b568c888c 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -32,6 +32,9 @@ #ifdef HAVE_SIGNAL_H #include <signal.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #include <errno.h> #include <stdlib.h> #include <string.h> diff --git a/src/lib/net/inaddr_st.h b/src/lib/net/inaddr_st.h index dc4c6e3a0..a6b779626 100644 --- a/src/lib/net/inaddr_st.h +++ b/src/lib/net/inaddr_st.h @@ -28,6 +28,9 @@ #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #ifdef _WIN32 #include <winsock2.h> @@ -60,7 +63,7 @@ struct in6_addr /** @{ */ /** Many BSD variants seem not to define these. */ #if defined(__APPLE__) || defined(__darwin__) || \ - defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) #ifndef s6_addr16 #define s6_addr16 __u6_addr.__u6_addr16 #endif diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index c879013ed..b00e854a1 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -12,6 +12,10 @@ #include <sys/types.h> #include <stdlib.h> +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + static unsigned fill_a_buffer_memset(void) __attribute__((noinline)); static unsigned fill_a_buffer_memwipe(void) __attribute__((noinline)); static unsigned fill_a_buffer_nothing(void) __attribute__((noinline)); diff --git a/src/test/test_options.c b/src/test/test_options.c index f14e620ee..dd24ff441 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -23,6 +23,10 @@ #include "test/test_helpers.h" #include "lib/net/resolve.h" +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + #define NS_MODULE test_options typedef struct {

1 0

[tor/maint-0.3.5] Add changes file for bug 28938
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit 09472791d0ccf5b527a5b59eceb218aff38c2880 Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Mon Jan 7 20:01:52 2019 -0600 Add changes file for bug 28938 The fix was in commit 30b84adb5f0b6e56d0fb82c374e3cb44089f64d0. Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- changes/bug28938 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug28938 b/changes/bug28938 new file mode 100644 index 000000000..de6c5f7b7 --- /dev/null +++ b/changes/bug28938 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix missing headers required for proper detection of + OpenBSD. Fixes bug 28938; bugfix on 0.3.5.1-alpha. + Patch from Kris Katterjohn.

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit e6a44012001afb2d4c5956e4b55ccf6b622fd79e Merge: a891d81c5 09472791d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 9 08:52:10 2019 -0500 Merge branch 'maint-0.3.5' changes/bug28938 | 4 ++++ src/app/config/config.c | 3 +++ src/core/or/connection_edge.c | 3 +++ src/ext/byteorder.h | 4 ++++ src/ext/ed25519/donna/ed25519-donna-portable-identify.h | 2 +- src/ext/trunnel/trunnel.c | 6 +++++- src/lib/err/backtrace.c | 3 +++ src/lib/net/inaddr_st.h | 5 ++++- src/test/test-memwipe.c | 4 ++++ src/test/test_options.c | 4 ++++ 10 files changed, 35 insertions(+), 3 deletions(-)

1 0

[tor/master] Fix (and make consistent) the use of OpenBSD preprocessor macro tests
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit c13a81f7f96a6433709b90c343d358c93cc7b9f8 Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Sun Dec 23 14:51:45 2018 -0600 Fix (and make consistent) the use of OpenBSD preprocessor macro tests Prior to this commit, the testsuite was failing on OpenBSD. After this commit the testsuite runs fine on OpenBSD. It was previously decided to test for the OpenBSD macro (rather than __OpenBSD__, etc.) because OpenBSD forks seem to have the former macro defined. sys/param.h must be included for the OpenBSD macro definition; however, many files tested for the OpenBSD macro without having this header included. This commit includes sys/param.h in the files where the OpenBSD macro is used (and sys/param.h is not already included), and it also changes some instances of the __OpenBSD__ macro to OpenBSD. See commit 27df23abb675ffeb198bf0c1cc85c4baed77a988 which changed everything to use OpenBSD instead of __OpenBSD__ or OPENBSD. See also tickets #6982 and #20980 (the latter ticket is where it was decided to use the OpenBSD macro). Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- src/app/config/config.c | 3 +++ src/core/or/connection_edge.c | 3 +++ src/ext/byteorder.h | 4 ++++ src/ext/ed25519/donna/ed25519-donna-portable-identify.h | 2 +- src/ext/trunnel/trunnel.c | 6 +++++- src/lib/err/backtrace.c | 3 +++ src/lib/net/inaddr_st.h | 5 ++++- src/test/test-memwipe.c | 4 ++++ src/test/test_options.c | 4 ++++ 9 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 4a8f94da0..c71ed0184 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -131,6 +131,9 @@ #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 58aefcf8f..2ec83c120 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -139,6 +139,9 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H) #include <net/if.h> diff --git a/src/ext/byteorder.h b/src/ext/byteorder.h index c8ba52184..95e080b14 100644 --- a/src/ext/byteorder.h +++ b/src/ext/byteorder.h @@ -29,6 +29,10 @@ Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c) */ +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + /* This code is extracted from csiphash.h */ #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ diff --git a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h index 26a264cf9..3e0f9cfc5 100644 --- a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h +++ b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h @@ -14,7 +14,7 @@ #define OS_OSX #elif defined(macintosh) || defined(Macintosh) #define OS_MAC - #elif defined(__OpenBSD__) + #elif defined(OpenBSD) #define OS_OPENBSD #endif #endif diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c index b749d8136..2442bc390 100644 --- a/src/ext/trunnel/trunnel.c +++ b/src/ext/trunnel/trunnel.c @@ -14,6 +14,10 @@ #include <stdlib.h> #include <string.h> +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ # define IS_LITTLE_ENDIAN 1 @@ -31,7 +35,7 @@ # define IS_LITTLE_ENDIAN # endif #else -# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) # include <sys/endian.h> # else # include <endian.h> diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index d18a595c3..b568c888c 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -32,6 +32,9 @@ #ifdef HAVE_SIGNAL_H #include <signal.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #include <errno.h> #include <stdlib.h> #include <string.h> diff --git a/src/lib/net/inaddr_st.h b/src/lib/net/inaddr_st.h index dc4c6e3a0..a6b779626 100644 --- a/src/lib/net/inaddr_st.h +++ b/src/lib/net/inaddr_st.h @@ -28,6 +28,9 @@ #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #ifdef _WIN32 #include <winsock2.h> @@ -60,7 +63,7 @@ struct in6_addr /** @{ */ /** Many BSD variants seem not to define these. */ #if defined(__APPLE__) || defined(__darwin__) || \ - defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) #ifndef s6_addr16 #define s6_addr16 __u6_addr.__u6_addr16 #endif diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index c879013ed..b00e854a1 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -12,6 +12,10 @@ #include <sys/types.h> #include <stdlib.h> +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + static unsigned fill_a_buffer_memset(void) __attribute__((noinline)); static unsigned fill_a_buffer_memwipe(void) __attribute__((noinline)); static unsigned fill_a_buffer_nothing(void) __attribute__((noinline)); diff --git a/src/test/test_options.c b/src/test/test_options.c index f14e620ee..dd24ff441 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -23,6 +23,10 @@ #include "test/test_helpers.h" #include "lib/net/resolve.h" +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + #define NS_MODULE test_options typedef struct {

1 0

[tor/master] Add changes file for bug 28938
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit 09472791d0ccf5b527a5b59eceb218aff38c2880 Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Mon Jan 7 20:01:52 2019 -0600 Add changes file for bug 28938 The fix was in commit 30b84adb5f0b6e56d0fb82c374e3cb44089f64d0. Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- changes/bug28938 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug28938 b/changes/bug28938 new file mode 100644 index 000000000..de6c5f7b7 --- /dev/null +++ b/changes/bug28938 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix missing headers required for proper detection of + OpenBSD. Fixes bug 28938; bugfix on 0.3.5.1-alpha. + Patch from Kris Katterjohn.

1 0

[tor/release-0.3.5] Add changes file for bug 28938
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit 09472791d0ccf5b527a5b59eceb218aff38c2880 Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Mon Jan 7 20:01:52 2019 -0600 Add changes file for bug 28938 The fix was in commit 30b84adb5f0b6e56d0fb82c374e3cb44089f64d0. Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- changes/bug28938 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug28938 b/changes/bug28938 new file mode 100644 index 000000000..de6c5f7b7 --- /dev/null +++ b/changes/bug28938 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix missing headers required for proper detection of + OpenBSD. Fixes bug 28938; bugfix on 0.3.5.1-alpha. + Patch from Kris Katterjohn.

1 0

[tor/release-0.3.5] Fix (and make consistent) the use of OpenBSD preprocessor macro tests
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit c13a81f7f96a6433709b90c343d358c93cc7b9f8 Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Sun Dec 23 14:51:45 2018 -0600 Fix (and make consistent) the use of OpenBSD preprocessor macro tests Prior to this commit, the testsuite was failing on OpenBSD. After this commit the testsuite runs fine on OpenBSD. It was previously decided to test for the OpenBSD macro (rather than __OpenBSD__, etc.) because OpenBSD forks seem to have the former macro defined. sys/param.h must be included for the OpenBSD macro definition; however, many files tested for the OpenBSD macro without having this header included. This commit includes sys/param.h in the files where the OpenBSD macro is used (and sys/param.h is not already included), and it also changes some instances of the __OpenBSD__ macro to OpenBSD. See commit 27df23abb675ffeb198bf0c1cc85c4baed77a988 which changed everything to use OpenBSD instead of __OpenBSD__ or OPENBSD. See also tickets #6982 and #20980 (the latter ticket is where it was decided to use the OpenBSD macro). Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- src/app/config/config.c | 3 +++ src/core/or/connection_edge.c | 3 +++ src/ext/byteorder.h | 4 ++++ src/ext/ed25519/donna/ed25519-donna-portable-identify.h | 2 +- src/ext/trunnel/trunnel.c | 6 +++++- src/lib/err/backtrace.c | 3 +++ src/lib/net/inaddr_st.h | 5 ++++- src/test/test-memwipe.c | 4 ++++ src/test/test_options.c | 4 ++++ 9 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 4a8f94da0..c71ed0184 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -131,6 +131,9 @@ #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 58aefcf8f..2ec83c120 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -139,6 +139,9 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H) #include <net/if.h> diff --git a/src/ext/byteorder.h b/src/ext/byteorder.h index c8ba52184..95e080b14 100644 --- a/src/ext/byteorder.h +++ b/src/ext/byteorder.h @@ -29,6 +29,10 @@ Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c) */ +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + /* This code is extracted from csiphash.h */ #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ diff --git a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h index 26a264cf9..3e0f9cfc5 100644 --- a/src/ext/ed25519/donna/ed25519-donna-portable-identify.h +++ b/src/ext/ed25519/donna/ed25519-donna-portable-identify.h @@ -14,7 +14,7 @@ #define OS_OSX #elif defined(macintosh) || defined(Macintosh) #define OS_MAC - #elif defined(__OpenBSD__) + #elif defined(OpenBSD) #define OS_OPENBSD #endif #endif diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c index b749d8136..2442bc390 100644 --- a/src/ext/trunnel/trunnel.c +++ b/src/ext/trunnel/trunnel.c @@ -14,6 +14,10 @@ #include <stdlib.h> #include <string.h> +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ # define IS_LITTLE_ENDIAN 1 @@ -31,7 +35,7 @@ # define IS_LITTLE_ENDIAN # endif #else -# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) # include <sys/endian.h> # else # include <endian.h> diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index d18a595c3..b568c888c 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -32,6 +32,9 @@ #ifdef HAVE_SIGNAL_H #include <signal.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #include <errno.h> #include <stdlib.h> #include <string.h> diff --git a/src/lib/net/inaddr_st.h b/src/lib/net/inaddr_st.h index dc4c6e3a0..a6b779626 100644 --- a/src/lib/net/inaddr_st.h +++ b/src/lib/net/inaddr_st.h @@ -28,6 +28,9 @@ #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #ifdef _WIN32 #include <winsock2.h> @@ -60,7 +63,7 @@ struct in6_addr /** @{ */ /** Many BSD variants seem not to define these. */ #if defined(__APPLE__) || defined(__darwin__) || \ - defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) #ifndef s6_addr16 #define s6_addr16 __u6_addr.__u6_addr16 #endif diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index c879013ed..b00e854a1 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -12,6 +12,10 @@ #include <sys/types.h> #include <stdlib.h> +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + static unsigned fill_a_buffer_memset(void) __attribute__((noinline)); static unsigned fill_a_buffer_memwipe(void) __attribute__((noinline)); static unsigned fill_a_buffer_nothing(void) __attribute__((noinline)); diff --git a/src/test/test_options.c b/src/test/test_options.c index f14e620ee..dd24ff441 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -23,6 +23,10 @@ #include "test/test_helpers.h" #include "lib/net/resolve.h" +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + #define NS_MODULE test_options typedef struct {

1 0