diff options
| author | beck <> | 2014-07-08 09:38:55 +0000 |
|---|---|---|
| committer | beck <> | 2014-07-08 09:38:55 +0000 |
| commit | a089ab976b6d2755b77dbe67295227a3cd65f4a0 (patch) | |
| tree | ad083bfd5ab0939211834b0ce317ab402e15bb94 | |
| parent | e2a83e54c743c528a062afe53b135babd1c61473 (diff) | |
| download | openbsd-a089ab976b6d2755b77dbe67295227a3cd65f4a0.tar.gz openbsd-a089ab976b6d2755b77dbe67295227a3cd65f4a0.tar.bz2 openbsd-a089ab976b6d2755b77dbe67295227a3cd65f4a0.zip | |
fix oops, accidental delete.. darn copying of files between machines
| -rw-r--r-- | src/lib/libcrypto/arc4random/getentropy_linux.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/crypto/getentropy_linux.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/arc4random/getentropy_linux.c b/src/lib/libcrypto/arc4random/getentropy_linux.c index 578c65bbe4..3fd30316d2 100644 --- a/src/lib/libcrypto/arc4random/getentropy_linux.c +++ b/src/lib/libcrypto/arc4random/getentropy_linux.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: getentropy_linux.c,v 1.17 2014/07/08 09:30:33 beck Exp $ */ | 1 | /* $OpenBSD: getentropy_linux.c,v 1.18 2014/07/08 09:38:55 beck Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> | 4 | * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> |
| @@ -317,7 +317,7 @@ getentropy_fallback(void *buf, size_t len) | |||
| 317 | HX((e = gettimeofday(&tv, NULL)) == -1, tv); | 317 | HX((e = gettimeofday(&tv, NULL)) == -1, tv); |
| 318 | if (e != -1) { | 318 | if (e != -1) { |
| 319 | cnt += (int)tv.tv_sec; | 319 | cnt += (int)tv.tv_sec; |
| 320 | nt += (int)tv.tv_usec; | 320 | cnt += (int)tv.tv_usec; |
| 321 | } | 321 | } |
| 322 | 322 | ||
| 323 | for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++) | 323 | for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++) |
diff --git a/src/lib/libcrypto/crypto/getentropy_linux.c b/src/lib/libcrypto/crypto/getentropy_linux.c index 578c65bbe4..3fd30316d2 100644 --- a/src/lib/libcrypto/crypto/getentropy_linux.c +++ b/src/lib/libcrypto/crypto/getentropy_linux.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: getentropy_linux.c,v 1.17 2014/07/08 09:30:33 beck Exp $ */ | 1 | /* $OpenBSD: getentropy_linux.c,v 1.18 2014/07/08 09:38:55 beck Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> | 4 | * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> |
| @@ -317,7 +317,7 @@ getentropy_fallback(void *buf, size_t len) | |||
| 317 | HX((e = gettimeofday(&tv, NULL)) == -1, tv); | 317 | HX((e = gettimeofday(&tv, NULL)) == -1, tv); |
| 318 | if (e != -1) { | 318 | if (e != -1) { |
| 319 | cnt += (int)tv.tv_sec; | 319 | cnt += (int)tv.tv_sec; |
| 320 | nt += (int)tv.tv_usec; | 320 | cnt += (int)tv.tv_usec; |
| 321 | } | 321 | } |
| 322 | 322 | ||
| 323 | for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++) | 323 | for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++) |