diff options
Diffstat (limited to 'src/lib/libc')
| -rw-r--r-- | src/lib/libc/crypt/bcrypt.c | 6 | ||||
| -rw-r--r-- | src/lib/libc/net/res_random.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libc/crypt/bcrypt.c b/src/lib/libc/crypt/bcrypt.c index 82de8fa33b..ba45b104ed 100644 --- a/src/lib/libc/crypt/bcrypt.c +++ b/src/lib/libc/crypt/bcrypt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bcrypt.c,v 1.57 2016/08/26 08:25:02 guenther Exp $ */ | 1 | /* $OpenBSD: bcrypt.c,v 1.58 2020/07/06 13:33:05 pirofti Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> | 4 | * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> |
| @@ -248,9 +248,9 @@ _bcrypt_autorounds(void) | |||
| 248 | char buf[_PASSWORD_LEN]; | 248 | char buf[_PASSWORD_LEN]; |
| 249 | int duration; | 249 | int duration; |
| 250 | 250 | ||
| 251 | clock_gettime(CLOCK_THREAD_CPUTIME_ID, &before); | 251 | WRAP(clock_gettime)(CLOCK_THREAD_CPUTIME_ID, &before); |
| 252 | bcrypt_newhash("testpassword", r, buf, sizeof(buf)); | 252 | bcrypt_newhash("testpassword", r, buf, sizeof(buf)); |
| 253 | clock_gettime(CLOCK_THREAD_CPUTIME_ID, &after); | 253 | WRAP(clock_gettime)(CLOCK_THREAD_CPUTIME_ID, &after); |
| 254 | 254 | ||
| 255 | duration = after.tv_sec - before.tv_sec; | 255 | duration = after.tv_sec - before.tv_sec; |
| 256 | duration *= 1000000; | 256 | duration *= 1000000; |
diff --git a/src/lib/libc/net/res_random.c b/src/lib/libc/net/res_random.c index 763e420bb8..b7036815c9 100644 --- a/src/lib/libc/net/res_random.c +++ b/src/lib/libc/net/res_random.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: res_random.c,v 1.24 2016/04/05 04:29:21 guenther Exp $ */ | 1 | /* $OpenBSD: res_random.c,v 1.25 2020/07/06 13:33:06 pirofti Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> | 4 | * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> |
| @@ -219,7 +219,7 @@ res_initid(void) | |||
| 219 | if (ru_prf != NULL) | 219 | if (ru_prf != NULL) |
| 220 | arc4random_buf(ru_prf, sizeof(*ru_prf)); | 220 | arc4random_buf(ru_prf, sizeof(*ru_prf)); |
| 221 | 221 | ||
| 222 | clock_gettime(CLOCK_MONOTONIC, &ts); | 222 | WRAP(clock_gettime)(CLOCK_MONOTONIC, &ts); |
| 223 | ru_reseed = ts.tv_sec + RU_OUT; | 223 | ru_reseed = ts.tv_sec + RU_OUT; |
| 224 | ru_msb = ru_msb == 0x8000 ? 0 : 0x8000; | 224 | ru_msb = ru_msb == 0x8000 ? 0 : 0x8000; |
| 225 | } | 225 | } |
| @@ -232,7 +232,7 @@ __res_randomid(void) | |||
| 232 | u_int r; | 232 | u_int r; |
| 233 | static void *randomid_mutex; | 233 | static void *randomid_mutex; |
| 234 | 234 | ||
| 235 | clock_gettime(CLOCK_MONOTONIC, &ts); | 235 | WRAP(clock_gettime)(CLOCK_MONOTONIC, &ts); |
| 236 | pid = getpid(); | 236 | pid = getpid(); |
| 237 | 237 | ||
| 238 | _MUTEX_LOCK(&randomid_mutex); | 238 | _MUTEX_LOCK(&randomid_mutex); |
