diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-11-22 16:49:56 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-11-22 18:32:48 +0100 |
| commit | 741f76cdb3f321edce92a316501fe54f52d87ba1 (patch) | |
| tree | a2050de08475e7693bc9ff4c249a012165d8c481 /src/noise.c | |
| parent | e79be273d702b198c1718a6189fa752e28fd4c03 (diff) | |
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.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/noise.c')
| -rw-r--r-- | src/noise.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) |