diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2005-12-19 17:40:40 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2005-12-19 17:40:40 +1100 |
| commit | 129d0bb6a65dcd9639e841cc3fd2ef3490420d7b (patch) | |
| tree | a56f568a753739143c8662390e8cf6d8f2f34025 /cipher-aes.c | |
| parent | d40c66cf3f5d7713ea9489778dc450a48984a81d (diff) | |
| download | openssh-git-129d0bb6a65dcd9639e841cc3fd2ef3490420d7b.tar.gz | |
- (dtucker) [cipher-aes.c cipher-ctr.c cipher.c configure.ac
openbsd-compat/openssl-compat.h] Check for and work around broken AES
ciphers >128bit on (some) Solaris 10 systems. ok djm@
Diffstat (limited to 'cipher-aes.c')
| -rw-r--r-- | cipher-aes.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cipher-aes.c b/cipher-aes.c index 22d500d4..228ddb10 100644 --- a/cipher-aes.c +++ b/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 */ |