summaryrefslogtreecommitdiff
path: root/cipher.c
diff options
context:
space:
mode:
authordtucker <dtucker>2005-06-17 11:15:20 +0000
committerdtucker <dtucker>2005-06-17 11:15:20 +0000
commite17b98e83fbfc4914c101987d5d3d883c470fa6b (patch)
treebd6e6f58e61864e287f0cde829de773f7545850e /cipher.c
parenta76a07381c5d7d984011e9a9721d7f0c9c6e9ff3 (diff)
downloadopenssh-e17b98e83fbfc4914c101987d5d3d883c470fa6b.tar.gz
- (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 20d0a80c..fc1e2ae1 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 $");
#include <openssl/md5.h>
+/* compatibility with old or broken OpenSSL versions */
+#include "openbsd-compat/openssl-compat.h"
+
extern const EVP_CIPHER *evp_ssh1_bf(void);
extern const EVP_CIPHER *evp_ssh1_3des(void);
extern void ssh1_3des_iv(EVP_CIPHER_CTX *, int, u_char *, int);