- (dtucker) [cipher-acss.c cipher.c] Enable acss only if building with

   OpenSSL >= 0.9.7.  ok djm@

3 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index b5c90504..aaae0204 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 20040206
  - (dtucker) [acss.c acss.h] Fix $Id tags.
+ - (dtucker) [cipher-acss.c cipher.c] Enable acss only if building with
+   OpenSSL >= 0.9.7.  ok djm@
 
 20040129
  - (dtucker) OpenBSD CVS Sync regress/
@@ -1785,4 +1787,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3205 2004/02/06 04:22:43 dtucker Exp $
+$Id: ChangeLog,v 1.3206 2004/02/06 04:26:10 dtucker Exp $
diff --git a/cipher-acss.c b/cipher-acss.c
index e2e3a406..3a966a74 100644
--- a/cipher-acss.c
+++ b/cipher-acss.c
@@ -17,9 +17,9 @@
 #include "includes.h"
 #include <openssl/evp.h>
 
-RCSID("$Id: cipher-acss.c,v 1.1 2004/01/27 10:19:22 djm Exp $");
+RCSID("$Id: cipher-acss.c,v 1.2 2004/02/06 04:26:11 dtucker Exp $");
 
-#if !defined(EVP_CTRL_SET_ACSS_MODE) && (OPENSSL_VERSION_NUMBER >= 0x00906000L)
+#if !defined(EVP_CTRL_SET_ACSS_MODE) && (OPENSSL_VERSION_NUMBER >= 0x00907000L)
 
 #include "acss.h"
 
diff --git a/cipher.c b/cipher.c
index 79c07ec4..8744cb7b 100644
--- a/cipher.c
+++ b/cipher.c
@@ -54,7 +54,7 @@ extern void ssh_rijndael_iv(EVP_CIPHER_CTX *, int, u_char *, u_int);
 #endif
 
 #if !defined(EVP_CTRL_SET_ACSS_MODE)
-# if (OPENSSL_VERSION_NUMBER >= 0x00906000L)
+# if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
 extern const EVP_CIPHER *evp_acss(void);
 #  define EVP_acss evp_acss
 #  define EVP_CTRL_SET_ACSS_MODE xxx	/* used below */