From c7b912449fde77f04a41011532672be837226784 Mon Sep 17 00:00:00 2001 From: dtucker Date: Fri, 6 Feb 2004 04:26:10 +0000 Subject: [PATCH] - (dtucker) [cipher-acss.c cipher.c] Enable acss only if building with OpenSSL >= 0.9.7. ok djm@ --- ChangeLog | 2 ++ cipher-acss.c | 2 +- cipher.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b22feeec..a2087cf1 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/ diff --git a/cipher-acss.c b/cipher-acss.c index eea05df4..e0bff225 100644 --- 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 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 */ -- 2.45.2