diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2008-02-28 19:13:52 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2008-02-28 19:13:52 +1100 |
| commit | bfaaf960a0204d5ee8ed75af05104737a54b4a52 (patch) | |
| tree | 8bbe75c53e48afb6ed451e15a812d61a19c53660 /openbsd-compat/openssl-compat.c | |
| parent | e1c4c542116fd41eec7dcb0d0b40d0797181c959 (diff) | |
- (dtucker) [includes.h ssh-add.c ssh-agent.c ssh-keygen.c ssh.c sshd.c
openbsd-compat/openssl-compat.{c,h}] Bug #1437 Move the OpenSSL compat
header to after OpenSSL headers, since some versions of OpenSSL have
SSLeay_add_all_algorithms as a macro already.
Diffstat (limited to 'openbsd-compat/openssl-compat.c')
| -rw-r--r-- | openbsd-compat/openssl-compat.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c index 9c9cdb98..49238ba8 100644 --- a/openbsd-compat/openssl-compat.c +++ b/openbsd-compat/openssl-compat.c @@ -1,4 +1,4 @@ -/* $Id: openssl-compat.c,v 1.5 2008/02/25 10:13:47 dtucker Exp $ */ +/* $Id: openssl-compat.c,v 1.6 2008/02/28 08:13:52 dtucker Exp $ */ /* * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> @@ -16,13 +16,15 @@ * 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, |