RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) [configure.ac defines.h] Skip arc4random_stir() calls on platforms 

that lack it but have arc4random_uniform()
This commit is contained in:
Damien Miller 2013-11-07 13:28:16 +11:00
parent a6fd1d3c38
commit df8b030b15
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -3,6 +3,8 @@
that got lost in recent merge. that got lost in recent merge.
- (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff - (djm) [Makefile.in monitor.c] Missed chunks of curve25519 KEX diff
- (djm) [regress/modpipe.c regress/rekey.sh] Never intended to commit these - (djm) [regress/modpipe.c regress/rekey.sh] Never intended to commit these
- (djm) [configure.ac defines.h] Skip arc4random_stir() calls on platforms
that lack it but have arc4random_uniform()
20131104 20131104
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync

5
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.537 2013/11/03 07:43:55 dtucker Exp $ # $Id: configure.ac,v 1.538 2013/11/07 02:28:16 djm Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
AC_REVISION($Revision: 1.537 $) AC_REVISION($Revision: 1.538 $)
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C]) AC_LANG([C])
@ -1528,6 +1528,7 @@ dnl Checks for library functions. Please keep in alphabetical order
AC_CHECK_FUNCS([ \ AC_CHECK_FUNCS([ \
arc4random \ arc4random \
arc4random_buf \ arc4random_buf \
arc4random_stir \
arc4random_uniform \ arc4random_uniform \
asprintf \ asprintf \
b64_ntop \ b64_ntop \

11
defines.h
View File

@ -25,7 +25,7 @@
#ifndef _DEFINES_H #ifndef _DEFINES_H
#define _DEFINES_H #define _DEFINES_H
/* $Id: defines.h,v 1.173 2013/11/03 07:43:55 dtucker Exp $ */ /* $Id: defines.h,v 1.174 2013/11/07 02:28:16 djm Exp $ */
/* Constants */ /* Constants */
@ -810,4 +810,13 @@ struct winsize {
# endif # endif
#endif #endif
/*
* Platforms that have arc4random_uniform() and not arc4random_stir()
* shouldn't need the latter.
*/
#if defined(HAVE_ARC4RANDOM) && defined(HAVE_ARC4RANDOM_UNIFORM) && \
!defined(HAVE_ARC4RANDOM_STIR)
# define arc4random_stir()
#endif
#endif /* _DEFINES_H */ #endif /* _DEFINES_H */