diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2008-02-25 21:13:47 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2008-02-25 21:13:47 +1100 |
| commit | 935e20a3f0b1bfbec50217d28983186cfd1ad203 (patch) | |
| tree | 013e9824ed780fa8389d58de6c113afc4ea207aa | |
| parent | acada07b525a21b938ae17c311f529edde932371 (diff) | |
| download | openssh-git-935e20a3f0b1bfbec50217d28983186cfd1ad203.tar.gz | |
- (dtucker) [includes.h openbsd-compat/openssl-compat.c] Bug #1437: reshuffle
headers so ./configure --with-ssl-engine actually works. Patch from
Ian Lister.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | includes.h | 1 | ||||
| -rw-r--r-- | openbsd-compat/openssl-compat.c | 6 |
3 files changed, 7 insertions, 5 deletions
@@ -5,6 +5,9 @@ - (dtucker) [configure.ac audit-bsm.c] Bug #1420: Add a local implementation of aug_get_machine for systems that don't have their own (eg OS X, FreeBSD). Help and testing from csjp at FreeBSD org, vgiffin at apple com. ok djm@ + - (dtucker) [includes.h openbsd-compat/openssl-compat.c] Bug #1437: reshuffle + headers so ./configure --with-ssl-engine actually works. Patch from + Ian Lister. 20080224 - (tim) [contrib/cygwin/ssh-host-config] @@ -3624,4 +3627,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4840 2008/02/25 10:05:04 dtucker Exp $ +$Id: ChangeLog,v 1.4841 2008/02/25 10:13:47 dtucker Exp $ @@ -166,6 +166,7 @@ #include "platform.h" #include "openbsd-compat/openbsd-compat.h" #include "openbsd-compat/bsd-nextstep.h" +#include "openbsd-compat/openssl-compat.h" #include "entropy.h" diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c index 45ebd3f6..9c9cdb98 100644 --- a/openbsd-compat/openssl-compat.c +++ b/openbsd-compat/openssl-compat.c @@ -1,4 +1,4 @@ -/* $Id: openssl-compat.c,v 1.4 2006/02/22 11:24:47 dtucker Exp $ */ +/* $Id: openssl-compat.c,v 1.5 2008/02/25 10:13:47 dtucker Exp $ */ /* * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> @@ -16,15 +16,13 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS #include "includes.h" #ifdef USE_OPENSSL_ENGINE # include <openssl/engine.h> #endif -#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS -#include "openssl-compat.h" - #ifdef SSH_OLD_EVP int ssh_EVP_CipherInit(EVP_CIPHER_CTX *evp, const EVP_CIPHER *type, |