summaryrefslogtreecommitdiff
path: root/cipher.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-06-17 21:15:20 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-06-17 21:15:20 +1000
commitf0bd352429f26f99b7bdacd23baf46b39a9f600a (patch)
treec63da8cd98b4c07fe502aa0fe49b2178d76c7367 /cipher.c
parenteccb9de72aa29da5a3fad87a4287b32438689c1f (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 'cipher.c')
-rw-r--r--cipher.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/cipher.c b/cipher.c
index 20d0a80c4..fc1e2ae1c 100644
--- a/cipher.c
+++ b/cipher.c
@@ -43,6 +43,9 @@ RCSID("$OpenBSD: cipher.c,v 1.76 2005/06/17 02:44:32 djm Exp $");
43 43
44#include <openssl/md5.h> 44#include <openssl/md5.h>
45 45
46/* compatibility with old or broken OpenSSL versions */
47#include "openbsd-compat/openssl-compat.h"
48
46extern const EVP_CIPHER *evp_ssh1_bf(void); 49extern const EVP_CIPHER *evp_ssh1_bf(void);
47extern const EVP_CIPHER *evp_ssh1_3des(void); 50extern const EVP_CIPHER *evp_ssh1_3des(void);
48extern void ssh1_3des_iv(EVP_CIPHER_CTX *, int, u_char *, int); 51extern void ssh1_3des_iv(EVP_CIPHER_CTX *, int, u_char *, int);