From 912a9ab18d01975be4672a32e257dd6d67a025dd Mon Sep 17 00:00:00 2001 From: kettenis Date: Wed, 16 Jul 2014 14:26:47 +0000 Subject: [PATCH] Only call getauxval(3) if HAVE_GETAUXVAL is defined. Fixes build on older Linux (such as Ubuntu 12.04LTS) that don't have it yet. Seems the AT_XXX defines are pulled in by now. ok beck@ --- lib/libcrypto/arc4random/getentropy_linux.c | 4 +++- lib/libcrypto/crypto/getentropy_linux.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/libcrypto/arc4random/getentropy_linux.c b/lib/libcrypto/arc4random/getentropy_linux.c index 40ea8a14adb..d5d36da1c5f 100644 --- a/lib/libcrypto/arc4random/getentropy_linux.c +++ b/lib/libcrypto/arc4random/getentropy_linux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getentropy_linux.c,v 1.24 2014/07/13 13:37:38 deraadt Exp $ */ +/* $OpenBSD: getentropy_linux.c,v 1.25 2014/07/16 14:26:47 kettenis Exp $ */ /* * Copyright (c) 2014 Theo de Raadt @@ -486,6 +486,7 @@ getentropy_fallback(void *buf, size_t len) HD(cnt); } +#ifdef HAVE_GETAUXVAL #ifdef AT_RANDOM /* Not as random as you think but we take what we are given */ p = (char *) getauxval(AT_RANDOM); @@ -501,6 +502,7 @@ getentropy_fallback(void *buf, size_t len) p = (char *) getauxval(AT_BASE); if (p) HD(p); +#endif #endif SHA512_Final(results, &ctx); diff --git a/lib/libcrypto/crypto/getentropy_linux.c b/lib/libcrypto/crypto/getentropy_linux.c index 40ea8a14adb..d5d36da1c5f 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.24 2014/07/13 13:37:38 deraadt Exp $ */ +/* $OpenBSD: getentropy_linux.c,v 1.25 2014/07/16 14:26:47 kettenis Exp $ */ /* * Copyright (c) 2014 Theo de Raadt @@ -486,6 +486,7 @@ getentropy_fallback(void *buf, size_t len) HD(cnt); } +#ifdef HAVE_GETAUXVAL #ifdef AT_RANDOM /* Not as random as you think but we take what we are given */ p = (char *) getauxval(AT_RANDOM); @@ -501,6 +502,7 @@ getentropy_fallback(void *buf, size_t len) p = (char *) getauxval(AT_BASE); if (p) HD(p); +#endif #endif SHA512_Final(results, &ctx); -- 2.20.1