From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 8 Aug 2019 13:15:42 +0000 (-0400)
Subject: Restore proper behavior of netinfo skew check
X-Git-Tag: tor-0.3.5.9~29^2~9^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd6cb453720a5300d00d7996c5b3a03f054cd293;p=thirdparty%2Ftor.git

Restore proper behavior of netinfo skew check

My previous fix removed a comparison, which would have caused us to
warn about every skew instead of skews of over an hour.
---

diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index ea69792f12..d44f719138 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -1721,7 +1721,7 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan)
   /* Act on apparent skew. */
   /** Warn when we get a netinfo skew with at least this value. */
 #define NETINFO_NOTICE_SKEW 3600
-  if (time_abs(apparent_skew) &&
+  if (time_abs(apparent_skew) > NETINFO_NOTICE_SKEW &&
       router_get_by_id_digest(chan->conn->identity_digest)) {
     int trusted = router_digest_is_trusted_dir(chan->conn->identity_digest);
     clock_skew_warning(TO_CONN(chan->conn), apparent_skew, trusted, LD_GENERAL,