summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--includes.h1
-rw-r--r--openbsd-compat/openssl-compat.c6
3 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b2140320..4aa487052 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
5 - (dtucker) [configure.ac audit-bsm.c] Bug #1420: Add a local implementation 5 - (dtucker) [configure.ac audit-bsm.c] Bug #1420: Add a local implementation
6 of aug_get_machine for systems that don't have their own (eg OS X, FreeBSD). 6 of aug_get_machine for systems that don't have their own (eg OS X, FreeBSD).
7 Help and testing from csjp at FreeBSD org, vgiffin at apple com. ok djm@ 7 Help and testing from csjp at FreeBSD org, vgiffin at apple com. ok djm@
8 - (dtucker) [includes.h openbsd-compat/openssl-compat.c] Bug #1437: reshuffle
9 headers so ./configure --with-ssl-engine actually works. Patch from
10 Ian Lister.
8 11
920080224 1220080224
10 - (tim) [contrib/cygwin/ssh-host-config] 13 - (tim) [contrib/cygwin/ssh-host-config]
@@ -3624,4 +3627,4 @@
3624 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3627 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3625 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3628 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3626 3629
3627$Id: ChangeLog,v 1.4840 2008/02/25 10:05:04 dtucker Exp $ 3630$Id: ChangeLog,v 1.4841 2008/02/25 10:13:47 dtucker Exp $
diff --git a/includes.h b/includes.h
index 9fcf1b023..af231a9b3 100644
--- a/includes.h
+++ b/includes.h
@@ -166,6 +166,7 @@
166#include "platform.h" 166#include "platform.h"
167#include "openbsd-compat/openbsd-compat.h" 167#include "openbsd-compat/openbsd-compat.h"
168#include "openbsd-compat/bsd-nextstep.h" 168#include "openbsd-compat/bsd-nextstep.h"
169#include "openbsd-compat/openssl-compat.h"
169 170
170#include "entropy.h" 171#include "entropy.h"
171 172
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
index 45ebd3f66..9c9cdb98e 100644
--- a/openbsd-compat/openssl-compat.c
+++ b/openbsd-compat/openssl-compat.c
@@ -1,4 +1,4 @@
1/* $Id: openssl-compat.c,v 1.4 2006/02/22 11:24:47 dtucker Exp $ */ 1/* $Id: openssl-compat.c,v 1.5 2008/02/25 10:13:47 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> 4 * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@@ -16,15 +16,13 @@
16 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 16 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 */ 17 */
18 18
19#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
19#include "includes.h" 20#include "includes.h"
20 21
21#ifdef USE_OPENSSL_ENGINE 22#ifdef USE_OPENSSL_ENGINE
22# include <openssl/engine.h> 23# include <openssl/engine.h>
23#endif 24#endif
24 25
25#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
26#include "openssl-compat.h"
27
28#ifdef SSH_OLD_EVP 26#ifdef SSH_OLD_EVP
29int 27int
30ssh_EVP_CipherInit(EVP_CIPHER_CTX *evp, const EVP_CIPHER *type, 28ssh_EVP_CipherInit(EVP_CIPHER_CTX *evp, const EVP_CIPHER *type,