diff options
| author | Damien Miller <djm@mindrot.org> | 2010-10-07 12:25:27 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-10-07 12:25:27 +0200 |
| commit | aa18063baf35e303832d9ec58204ffaab221de85 (patch) | |
| tree | 0b3b3e436ca70f27734c99f6ace5503418b99001 /openbsd-compat/openbsd-compat.h | |
| parent | - jmc@cvs.openbsd.org 2010/09/23 13:36:46 (diff) | |
| download | openssh-aa18063baf35e303832d9ec58204ffaab221de85.tar.xz openssh-aa18063baf35e303832d9ec58204ffaab221de85.zip | |
- matthew@cvs.openbsd.org 2010/09/24 13:33:00
[misc.c misc.h configure.ac openbsd-compat/openbsd-compat.h]
[openbsd-compat/timingsafe_bcmp.c]
Add timingsafe_bcmp(3) to libc, mention that it's already in the
kernel in kern(9), and remove it from OpenSSH.
ok deraadt@, djm@
NB. re-added under openbsd-compat/ for portable OpenSSH
Diffstat (limited to 'openbsd-compat/openbsd-compat.h')
| -rw-r--r-- | openbsd-compat/openbsd-compat.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index e15d2bd96..77c5ed2b1 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h @@ -1,4 +1,4 @@ -/* $Id: openbsd-compat.h,v 1.50 2010/08/16 03:15:23 dtucker Exp $ */ +/* $Id: openbsd-compat.h,v 1.51 2010/10/07 10:25:29 djm Exp $ */ /* * Copyright (c) 1999-2003 Damien Miller. All rights reserved. @@ -213,6 +213,10 @@ char *user_from_uid(uid_t, int); char *group_from_gid(gid_t, int); #endif +#ifndef HAVE_TIMINGSAFE_BCMP +int timingsafe_bcmp(const void *, const void *, size_t); +#endif + void *xmmap(size_t size); char *xcrypt(const char *password, const char *salt); char *shadow_pw(struct passwd *pw); |