diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | cipher-acss.c | 4 | ||||
-rw-r--r-- | cipher.c | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -1,5 +1,7 @@ | |||
1 | 20040206 | 1 | 20040206 |
2 | - (dtucker) [acss.c acss.h] Fix $Id tags. | 2 | - (dtucker) [acss.c acss.h] Fix $Id tags. |
3 | - (dtucker) [cipher-acss.c cipher.c] Enable acss only if building with | ||
4 | OpenSSL >= 0.9.7. ok djm@ | ||
3 | 5 | ||
4 | 20040129 | 6 | 20040129 |
5 | - (dtucker) OpenBSD CVS Sync regress/ | 7 | - (dtucker) OpenBSD CVS Sync regress/ |
@@ -1785,4 +1787,4 @@ | |||
1785 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1787 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1786 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1788 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1787 | 1789 | ||
1788 | $Id: ChangeLog,v 1.3205 2004/02/06 04:22:43 dtucker Exp $ | 1790 | $Id: ChangeLog,v 1.3206 2004/02/06 04:26:10 dtucker Exp $ |
diff --git a/cipher-acss.c b/cipher-acss.c index e2e3a4060..3a966a74d 100644 --- a/cipher-acss.c +++ b/cipher-acss.c | |||
@@ -17,9 +17,9 @@ | |||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | #include <openssl/evp.h> | 18 | #include <openssl/evp.h> |
19 | 19 | ||
20 | RCSID("$Id: cipher-acss.c,v 1.1 2004/01/27 10:19:22 djm Exp $"); | 20 | RCSID("$Id: cipher-acss.c,v 1.2 2004/02/06 04:26:11 dtucker Exp $"); |
21 | 21 | ||
22 | #if !defined(EVP_CTRL_SET_ACSS_MODE) && (OPENSSL_VERSION_NUMBER >= 0x00906000L) | 22 | #if !defined(EVP_CTRL_SET_ACSS_MODE) && (OPENSSL_VERSION_NUMBER >= 0x00907000L) |
23 | 23 | ||
24 | #include "acss.h" | 24 | #include "acss.h" |
25 | 25 | ||
@@ -54,7 +54,7 @@ extern void ssh_rijndael_iv(EVP_CIPHER_CTX *, int, u_char *, u_int); | |||
54 | #endif | 54 | #endif |
55 | 55 | ||
56 | #if !defined(EVP_CTRL_SET_ACSS_MODE) | 56 | #if !defined(EVP_CTRL_SET_ACSS_MODE) |
57 | # if (OPENSSL_VERSION_NUMBER >= 0x00906000L) | 57 | # if (OPENSSL_VERSION_NUMBER >= 0x00907000L) |
58 | extern const EVP_CIPHER *evp_acss(void); | 58 | extern const EVP_CIPHER *evp_acss(void); |
59 | # define EVP_acss evp_acss | 59 | # define EVP_acss evp_acss |
60 | # define EVP_CTRL_SET_ACSS_MODE xxx /* used below */ | 60 | # define EVP_CTRL_SET_ACSS_MODE xxx /* used below */ |