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

   OpenSSL >= 0.9.7.  ok djm@

diff --git a/ChangeLog b/ChangeLog
index b22feeece470617d25a61b3f30c36dbc8aa64ba2..a2087cf197675eb5fd3a1ae6429ea0254b278b4e 100644 (file)
--- 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/

diff --git a/cipher-acss.c b/cipher-acss.c
index eea05df48b76f0836bb04bfb98ab5641dc444a8b..e0bff225eedc4a0fcd12d6b36693625d438bad70 100644 (file)
--- a/cipher-acss.c
+++ b/cipher-acss.c
@@ -19,7 +19,7 @@
 
 RCSID("$Id$");
 
-#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 79c07ec4f58cde7f17840b1f618db6a858c39663..8744cb7b7280cfba756dbdb06bfa37ee8242a8d4 100644 (file)
--- 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 */