diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-06-17 21:15:20 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-06-17 21:15:20 +1000 |
commit | f0bd352429f26f99b7bdacd23baf46b39a9f600a (patch) | |
tree | c63da8cd98b4c07fe502aa0fe49b2178d76c7367 /openbsd-compat/openssl-compat.c | |
parent | eccb9de72aa29da5a3fad87a4287b32438689c1f (diff) |
- (dtucker) [cipher.c openbsd-compat/openbsd-compat.h
openbsd-compat/openssl-compat.c] only include openssl compat stuff where
it's needed as it can cause conflicts elsewhere (eg xcrypt.c). Found by
and ok tim@
----------------------------------------------------------------------
automatically CVS: CVS: Committing in . CVS: CVS: Modified Files:
----------------------------------------------------------------------
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 10b4d1d74..b690e8fe6 100644 --- a/openbsd-compat/openssl-compat.c +++ b/openbsd-compat/openssl-compat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openssl-compat.c,v 1.1 2005/06/09 11:45:11 dtucker Exp $ */ | 1 | /* $Id: openssl-compat.c,v 1.2 2005/06/17 11:15:21 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,9 +16,11 @@ | |||
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_REDEF_EVP | ||
20 | #include "includes.h" | 19 | #include "includes.h" |
21 | 20 | ||
21 | #define SSH_DONT_REDEF_EVP | ||
22 | #include "openssl-compat.h" | ||
23 | |||
22 | #ifdef SSH_OLD_EVP | 24 | #ifdef SSH_OLD_EVP |
23 | int | 25 | int |
24 | ssh_EVP_CipherInit(EVP_CIPHER_CTX *evp, const EVP_CIPHER *type, | 26 | ssh_EVP_CipherInit(EVP_CIPHER_CTX *evp, const EVP_CIPHER *type, |