From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 9 Jan 2015 13:50:56 +0000 (-0500)
Subject: Allow two ISO times to appear in EntryGuardDownSince.
X-Git-Tag: tor-0.2.6.3-alpha~187
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33df3e37ffecfed309a1a0f210a96620c0ebb837;p=thirdparty%2Ftor.git

Allow two ISO times to appear in EntryGuardDownSince.

When I made time parsing more strict, I broke the
EntryGuardDownSince line, which relied on two concatenated ISO times
being parsed as a single time.

Fixes bug 14136. Bugfix on 7984fc153112baa5. Bug not in any released
version of Tor.
---

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 9eb0efd670..968a993999 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -1319,7 +1319,7 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg)
                "EntryGuardDownSince/UnlistedSince without EntryGuard");
         break;
       }
-      if (parse_iso_time(line->value, &when)<0) {
+      if (parse_iso_time_(line->value, &when, 0)<0) {
         *msg = tor_strdup("Unable to parse entry nodes: "
                           "Bad time in EntryGuardDownSince/UnlistedSince");
         break;