diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-08-25 17:26:44 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-08-25 17:26:44 +0000 |
| commit | f47efdb34885a1181ca51b7d8dc04842d5750af5 (patch) | |
| tree | 58b4fbd66ef82294715d4a800c8f292495296aea | |
| parent | 0017c71ced26ad8f4584ef0861022f031b1474eb (diff) | |
unify versions, so they are easier to diff.
| -rw-r--r-- | lib/libcrypto/crypto/getentropy_aix.c | 6 | ||||
| -rw-r--r-- | lib/libcrypto/crypto/getentropy_hpux.c | 4 | ||||
| -rw-r--r-- | lib/libcrypto/crypto/getentropy_linux.c | 4 | ||||
| -rw-r--r-- | lib/libcrypto/crypto/getentropy_solaris.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lib/libcrypto/crypto/getentropy_aix.c b/lib/libcrypto/crypto/getentropy_aix.c index 978bd144c04..56096e7c4a0 100644 --- a/lib/libcrypto/crypto/getentropy_aix.c +++ b/lib/libcrypto/crypto/getentropy_aix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getentropy_aix.c,v 1.2 2015/04/27 03:34:43 bcook Exp $ */ +/* $OpenBSD: getentropy_aix.c,v 1.3 2015/08/25 17:26:43 deraadt Exp $ */ /* * Copyright (c) 2015 Michael Felt <aixtools@gmail.com> @@ -17,7 +17,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * Intended to Emulate getentropy(2) as documented at: + * Emulation of getentropy(2) as documented at: * http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man2/getentropy.2 */ /* @@ -56,7 +56,7 @@ #define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l))) #define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x))) -#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*))) +#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*))) int getentropy(void *buf, size_t len); diff --git a/lib/libcrypto/crypto/getentropy_hpux.c b/lib/libcrypto/crypto/getentropy_hpux.c index 753c9af12b4..2c4abfc96d7 100644 --- a/lib/libcrypto/crypto/getentropy_hpux.c +++ b/lib/libcrypto/crypto/getentropy_hpux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getentropy_hpux.c,v 1.2 2015/01/07 01:15:57 bcook Exp $ */ +/* $OpenBSD: getentropy_hpux.c,v 1.3 2015/08/25 17:26:43 deraadt Exp $ */ /* * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> @@ -60,7 +60,7 @@ #define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l))) #define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x))) -#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*))) +#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*))) int getentropy(void *buf, size_t len); diff --git a/lib/libcrypto/crypto/getentropy_linux.c b/lib/libcrypto/crypto/getentropy_linux.c index 05fb95c4bb6..fb218feefaf 100644 --- a/lib/libcrypto/crypto/getentropy_linux.c +++ b/lib/libcrypto/crypto/getentropy_linux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getentropy_linux.c,v 1.39 2015/06/13 02:33:58 bcook Exp $ */ +/* $OpenBSD: getentropy_linux.c,v 1.40 2015/08/25 17:26:43 deraadt Exp $ */ /* * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> @@ -299,7 +299,7 @@ sysctlfailed: } #endif /* SYS__sysctl */ -static int cl[] = { +static const int cl[] = { CLOCK_REALTIME, #ifdef CLOCK_MONOTONIC CLOCK_MONOTONIC, diff --git a/lib/libcrypto/crypto/getentropy_solaris.c b/lib/libcrypto/crypto/getentropy_solaris.c index 6ec2fe584c7..4133d895fd9 100644 --- a/lib/libcrypto/crypto/getentropy_solaris.c +++ b/lib/libcrypto/crypto/getentropy_solaris.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getentropy_solaris.c,v 1.9 2014/07/21 20:19:47 guenther Exp $ */ +/* $OpenBSD: getentropy_solaris.c,v 1.10 2015/08/25 17:26:43 deraadt Exp $ */ /* * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> @@ -64,7 +64,7 @@ #define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l))) #define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x))) -#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*))) +#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*))) int getentropy(void *buf, size_t len); |