summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-03 10:26:06 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-03 10:26:06 -0400
commitc75215c23ad9e3a3142ce65a06a6231425f0e30e (patch)
tree08673dff22c83935b17bdd00567c94bc09aa9e0f /src/or
parente2a94dc48147c9bad1f09f8b14df3bec0e3f5e94 (diff)
downloadtor-c75215c23ad9e3a3142ce65a06a6231425f0e30e.tar.gz
tor-c75215c23ad9e3a3142ce65a06a6231425f0e30e.zip
Clean up various things that broke with our stdint.h changes
Casting before printf was necessary; now it's not so smart. We don't have SIZEOF_UINT8_T any more.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/torcert.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/torcert.c b/src/or/torcert.c
index 785132c174..f443738054 100644
--- a/src/or/torcert.c
+++ b/src/or/torcert.c
@@ -168,7 +168,7 @@ tor_cert_parse(const uint8_t *encoded, const size_t len)
memcpy(cert->signed_key.pubkey, parsed->certified_key, 32);
int64_t valid_until_64 = ((int64_t)parsed->exp_field) * 3600;
-#if SIZEOF_TIME_T < SIZEOF_INT64_T
+#if SIZEOF_TIME_T < 8
if (valid_until_64 > TIME_MAX)
valid_until_64 = TIME_MAX - 1;
#endif
@@ -723,4 +723,3 @@ tor_cert_encode_ed22519(const tor_cert_t *cert, char **cert_str_out)
tor_free(ed_cert_b64);
return ret;
}
-