RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-04-17 12:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [openbsd-compat/openbsd-compat.h] Add null implementation of

Browse Source 
arc4random_stir for platforms that have arc4random but don't have
   arc4random_stir (right now this is only OpenBSD -current).
This commit is contained in:
Darren Tucker 2013-11-08 18:54:38 +11:00
parent 3420a50169
commit ccdb9bec46
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18,6 +18,9 @@
openssh-6.4 openssh-6.4
- (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
[contrib/suse/openssh.spec] Update version numbers following release. [contrib/suse/openssh.spec] Update version numbers following release.
- (dtucker) [openbsd-compat/openbsd-compat.h] Add null implementation of
arc4random_stir for platforms that have arc4random but don't have
arc4random_stir (right now this is only OpenBSD -current).
20131107 20131107
- (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5) - (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5)

8
openbsd-compat/openbsd-compat.h
View File

@ -1,4 +1,4 @@
/* $Id: openbsd-compat.h,v 1.58 2013/06/05 22:30:21 dtucker Exp $ */ /* $Id: openbsd-compat.h,v 1.59 2013/11/08 07:54:39 dtucker Exp $ */
/* /*
* Copyright (c) 1999-2003 Damien Miller. All rights reserved. * Copyright (c) 1999-2003 Damien Miller. All rights reserved.
@ -163,7 +163,11 @@ int writev(int, struct iovec *, int);
int getpeereid(int , uid_t *, gid_t *); int getpeereid(int , uid_t *, gid_t *);
#endif #endif
#ifndef HAVE_ARC4RANDOM #ifdef HAVE_ARC4RANDOM
# ifndef HAVE_ARC4RANDOM_STIR
# define arc4random_stir()
# endif
#else
unsigned int arc4random(void); unsigned int arc4random(void);
void arc4random_stir(void); void arc4random_stir(void);
#endif /* !HAVE_ARC4RANDOM */ #endif /* !HAVE_ARC4RANDOM */