diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2006-03-22 19:46:12 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2006-03-22 19:46:12 +0000 |
| commit | 021d409f5beb1827f72d24f171e3c3ed233ed62a (patch) | |
| tree | 42b3633dec62ddc0b702c6e83df5d64683b1c6c3 /crypto/openssh/cipher-aes.c | |
| parent | 043840df5be0cf8490b48a08fe6d9c316f473f58 (diff) | |
| download | src-test2-021d409f5beb1827f72d24f171e3c3ed233ed62a.tar.gz src-test2-021d409f5beb1827f72d24f171e3c3ed233ed62a.zip | |
Notes
Diffstat (limited to 'crypto/openssh/cipher-aes.c')
| -rw-r--r-- | crypto/openssh/cipher-aes.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/openssh/cipher-aes.c b/crypto/openssh/cipher-aes.c index 22d500d4290a..228ddb104417 100644 --- a/crypto/openssh/cipher-aes.c +++ b/crypto/openssh/cipher-aes.c @@ -23,7 +23,11 @@ */ #include "includes.h" -#if OPENSSL_VERSION_NUMBER < 0x00907000L + +/* compatibility with old or broken OpenSSL versions */ +#include "openbsd-compat/openssl-compat.h" + +#ifdef USE_BUILTIN_RIJNDAEL RCSID("$OpenBSD: cipher-aes.c,v 1.2 2003/11/26 21:44:29 djm Exp $"); #include <openssl/evp.h> @@ -31,10 +35,6 @@ RCSID("$OpenBSD: cipher-aes.c,v 1.2 2003/11/26 21:44:29 djm Exp $"); #include "xmalloc.h" #include "log.h" -#if OPENSSL_VERSION_NUMBER < 0x00906000L -#define SSH_OLD_EVP -#endif - #define RIJNDAEL_BLOCKSIZE 16 struct ssh_rijndael_ctx { @@ -157,4 +157,4 @@ evp_rijndael(void) #endif return (&rijndal_cbc); } -#endif /* OPENSSL_VERSION_NUMBER */ +#endif /* USE_BUILTIN_RIJNDAEL */ |