From 314c17259e09d18af9fcafa9d7e8b59c5cf1e1ca Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 22 Nov 2017 16:49:56 +0100 Subject: global: switch from timeval to timespec This gets us nanoseconds instead of microseconds, which is better, and we can do this pretty much without freaking out existing userspace, which doesn't actually make use of the nano/micro seconds field: zx2c4@thinkpad ~ $ cat a.c void main() { puts(sizeof(struct timeval) == sizeof(struct timespec) ? "success" : "failure"); } zx2c4@thinkpad ~ $ gcc a.c -m64 && ./a.out success zx2c4@thinkpad ~ $ gcc a.c -m32 && ./a.out success This doesn't solve y2038 problem, but timespec64 isn't yet a thing in userspace. --- src/noise.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/noise.c') diff --git a/src/noise.c b/src/noise.c index 6ce9b78..9d99bfa 100644 --- a/src/noise.c +++ b/src/noise.c @@ -349,12 +349,12 @@ static void message_ephemeral(u8 ephemeral_dst[NOISE_PUBLIC_KEY_LEN], const u8 e static void tai64n_now(u8 output[NOISE_TIMESTAMP_LEN]) { - struct timeval now; + struct timespec64 now; - do_gettimeofday(&now); + getnstimeofday64(&now); /* https://cr.yp.to/libtai/tai64.html */ *(__be64 *)output = cpu_to_be64(4611686018427387914ULL + now.tv_sec); - *(__be32 *)(output + sizeof(__be64)) = cpu_to_be32(1000 * now.tv_usec + 500); + *(__be32 *)(output + sizeof(__be64)) = cpu_to_be32(now.tv_nsec); } bool noise_handshake_create_initiation(struct message_handshake_initiation *dst, struct noise_handshake *handshake) -- cgit v1.2.3-59-g8ed1b