diff options
Diffstat (limited to 'openbsd-compat/openbsd-compat.h')
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 392fa38dc..f34619e4a 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.60 2013/12/07 00:51:54 djm 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. |
@@ -44,6 +44,7 @@ | |||
44 | #include "vis.h" | 44 | #include "vis.h" |
45 | #include "getrrsetbyname.h" | 45 | #include "getrrsetbyname.h" |
46 | #include "sha2.h" | 46 | #include "sha2.h" |
47 | #include "blf.h" | ||
47 | 48 | ||
48 | #ifndef HAVE_BASENAME | 49 | #ifndef HAVE_BASENAME |
49 | char *basename(const char *path); | 50 | char *basename(const char *path); |
@@ -161,9 +162,13 @@ int writev(int, struct iovec *, int); | |||
161 | 162 | ||
162 | #ifndef HAVE_GETPEEREID | 163 | #ifndef HAVE_GETPEEREID |
163 | int getpeereid(int , uid_t *, gid_t *); | 164 | int getpeereid(int , uid_t *, gid_t *); |
164 | #endif | 165 | #endif |
165 | 166 | ||
166 | #ifndef HAVE_ARC4RANDOM | 167 | #ifdef HAVE_ARC4RANDOM |
168 | # ifndef HAVE_ARC4RANDOM_STIR | ||
169 | # define arc4random_stir() | ||
170 | # endif | ||
171 | #else | ||
167 | unsigned int arc4random(void); | 172 | unsigned int arc4random(void); |
168 | void arc4random_stir(void); | 173 | void arc4random_stir(void); |
169 | #endif /* !HAVE_ARC4RANDOM */ | 174 | #endif /* !HAVE_ARC4RANDOM */ |
@@ -236,6 +241,11 @@ char *group_from_gid(gid_t, int); | |||
236 | int timingsafe_bcmp(const void *, const void *, size_t); | 241 | int timingsafe_bcmp(const void *, const void *, size_t); |
237 | #endif | 242 | #endif |
238 | 243 | ||
244 | #ifndef HAVE_BCRYPT_PBKDF | ||
245 | int bcrypt_pbkdf(const char *, size_t, const u_int8_t *, size_t, | ||
246 | u_int8_t *, size_t, unsigned int); | ||
247 | #endif | ||
248 | |||
239 | void *xmmap(size_t size); | 249 | void *xmmap(size_t size); |
240 | char *xcrypt(const char *password, const char *salt); | 250 | char *xcrypt(const char *password, const char *salt); |
241 | char *shadow_pw(struct passwd *pw); | 251 | char *shadow_pw(struct passwd *pw); |