diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2005-12-19 07:40:40 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2005-12-19 07:40:40 +0100 |
| commit | 129d0bb6a65dcd9639e841cc3fd2ef3490420d7b (patch) | |
| tree | a56f568a753739143c8662390e8cf6d8f2f34025 /openbsd-compat/openssl-compat.h | |
| parent | - (dtucker) [configure.ac openbsd-compat/bsd-snprintf.c] Bug #1133: Our (diff) | |
| download | openssh-129d0bb6a65dcd9639e841cc3fd2ef3490420d7b.tar.xz openssh-129d0bb6a65dcd9639e841cc3fd2ef3490420d7b.zip | |
- (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 'openbsd-compat/openssl-compat.h')
| -rw-r--r-- | openbsd-compat/openssl-compat.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index 4988485f1..8a015ec43 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h @@ -1,4 +1,4 @@ -/* $Id: openssl-compat.h,v 1.2 2005/11/20 03:10:00 dtucker Exp $ */ +/* $Id: openssl-compat.h,v 1.3 2005/12/19 06:40:40 dtucker Exp $ */ /* * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> @@ -24,7 +24,11 @@ # define EVP_CIPHER_CTX_get_app_data(e) ((e)->app_data) #endif -#if OPENSSL_VERSION_NUMBER < 0x00907000L +#if (OPENSSL_VERSION_NUMBER < 0x00907000L) || defined(OPENSSL_LOBOTOMISED_AES) +# define USE_BUILTIN_RIJNDAEL +#endif + +#ifdef USE_BUILTIN_RIJNDAEL # define EVP_aes_128_cbc evp_rijndael # define EVP_aes_192_cbc evp_rijndael # define EVP_aes_256_cbc evp_rijndael |