summaryrefslogtreecommitdiff
path: root/openbsd-compat
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-02-25 21:13:47 +1100
committerDarren Tucker <dtucker@zip.com.au>2008-02-25 21:13:47 +1100
commit935e20a3f0b1bfbec50217d28983186cfd1ad203 (patch)
tree013e9824ed780fa8389d58de6c113afc4ea207aa /openbsd-compat
parentacada07b525a21b938ae17c311f529edde932371 (diff)
- (dtucker) [includes.h openbsd-compat/openssl-compat.c] Bug #1437: reshuffle
headers so ./configure --with-ssl-engine actually works. Patch from Ian Lister.
Diffstat (limited to 'openbsd-compat')
-rw-r--r--openbsd-compat/openssl-compat.c6
1 files changed, 2 insertions, 4 deletions
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,