diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 10 |
2 files changed, 10 insertions, 3 deletions
@@ -18,6 +18,9 @@ | |||
18 | openssh-6.4 | 18 | openssh-6.4 |
19 | - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] | 19 | - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] |
20 | [contrib/suse/openssh.spec] Update version numbers following release. | 20 | [contrib/suse/openssh.spec] Update version numbers following release. |
21 | - (dtucker) [openbsd-compat/openbsd-compat.h] Add null implementation of | ||
22 | arc4random_stir for platforms that have arc4random but don't have | ||
23 | arc4random_stir (right now this is only OpenBSD -current). | ||
21 | 24 | ||
22 | 20131107 | 25 | 20131107 |
23 | - (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5) | 26 | - (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5) |
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 392fa38dc..cb007f018 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openbsd-compat.h,v 1.58 2013/06/05 22:30:21 dtucker Exp $ */ | 1 | /* $Id: openbsd-compat.h,v 1.59 2013/11/08 07:54:39 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -161,9 +161,13 @@ int writev(int, struct iovec *, int); | |||
161 | 161 | ||
162 | #ifndef HAVE_GETPEEREID | 162 | #ifndef HAVE_GETPEEREID |
163 | int getpeereid(int , uid_t *, gid_t *); | 163 | int getpeereid(int , uid_t *, gid_t *); |
164 | #endif | 164 | #endif |
165 | 165 | ||
166 | #ifndef HAVE_ARC4RANDOM | 166 | #ifdef HAVE_ARC4RANDOM |
167 | # ifndef HAVE_ARC4RANDOM_STIR | ||
168 | # define arc4random_stir() | ||
169 | # endif | ||
170 | #else | ||
167 | unsigned int arc4random(void); | 171 | unsigned int arc4random(void); |
168 | void arc4random_stir(void); | 172 | void arc4random_stir(void); |
169 | #endif /* !HAVE_ARC4RANDOM */ | 173 | #endif /* !HAVE_ARC4RANDOM */ |