summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-11-07 13:28:16 +1100
committerDamien Miller <djm@mindrot.org>2013-11-07 13:28:16 +1100
commitdf8b030b15fcec7baf38ec7944f309f9ca8cc9a7 (patch)
tree70ae8223d81ef4a7692be0eb295ad5cf1b98aee7
parenta6fd1d3c38a562709374a70fa76423859160aa90 (diff)
- (djm) [configure.ac defines.h] Skip arc4random_stir() calls on platforms
that lack it but have arc4random_uniform()
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac5
-rw-r--r--defines.h11
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2864e1623..be1c19090 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
3 that got lost in recent merge. 3 that got lost in recent merge.
4 - (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff 4 - (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff
5 - (djm) [regress/modpipe.c regress/rekey.sh] Never intended to commit these 5 - (djm) [regress/modpipe.c regress/rekey.sh] Never intended to commit these
6 - (djm) [configure.ac defines.h] Skip arc4random_stir() calls on platforms
7 that lack it but have arc4random_uniform()
6 8
720131104 920131104
8 - (djm) OpenBSD CVS Sync 10 - (djm) OpenBSD CVS Sync
diff --git a/configure.ac b/configure.ac
index 0611b71b9..e545730d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.537 2013/11/03 07:43:55 dtucker Exp $ 1# $Id: configure.ac,v 1.538 2013/11/07 02:28:16 djm Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) 17AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
18AC_REVISION($Revision: 1.537 $) 18AC_REVISION($Revision: 1.538 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20AC_LANG([C]) 20AC_LANG([C])
21 21
@@ -1528,6 +1528,7 @@ dnl Checks for library functions. Please keep in alphabetical order
1528AC_CHECK_FUNCS([ \ 1528AC_CHECK_FUNCS([ \
1529 arc4random \ 1529 arc4random \
1530 arc4random_buf \ 1530 arc4random_buf \
1531 arc4random_stir \
1531 arc4random_uniform \ 1532 arc4random_uniform \
1532 asprintf \ 1533 asprintf \
1533 b64_ntop \ 1534 b64_ntop \
diff --git a/defines.h b/defines.h
index f4b262c82..b014f349b 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
25#ifndef _DEFINES_H 25#ifndef _DEFINES_H
26#define _DEFINES_H 26#define _DEFINES_H
27 27
28/* $Id: defines.h,v 1.173 2013/11/03 07:43:55 dtucker Exp $ */ 28/* $Id: defines.h,v 1.174 2013/11/07 02:28:16 djm Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -810,4 +810,13 @@ struct winsize {
810# endif 810# endif
811#endif 811#endif
812 812
813/*
814 * Platforms that have arc4random_uniform() and not arc4random_stir()
815 * shouldn't need the latter.
816 */
817#if defined(HAVE_ARC4RANDOM) && defined(HAVE_ARC4RANDOM_UNIFORM) && \
818 !defined(HAVE_ARC4RANDOM_STIR)
819# define arc4random_stir()
820#endif
821
813#endif /* _DEFINES_H */ 822#endif /* _DEFINES_H */