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 /openbsd-compat | |
parent | d40c66cf3f5d7713ea9489778dc450a48984a81d (diff) |
- (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')
-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 @@ | |||
1 | /* $Id: openssl-compat.h,v 1.2 2005/11/20 03:10:00 dtucker Exp $ */ | 1 | /* $Id: openssl-compat.h,v 1.3 2005/12/19 06:40:40 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> | 4 | * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> |
@@ -24,7 +24,11 @@ | |||
24 | # define EVP_CIPHER_CTX_get_app_data(e) ((e)->app_data) | 24 | # define EVP_CIPHER_CTX_get_app_data(e) ((e)->app_data) |
25 | #endif | 25 | #endif |
26 | 26 | ||
27 | #if OPENSSL_VERSION_NUMBER < 0x00907000L | 27 | #if (OPENSSL_VERSION_NUMBER < 0x00907000L) || defined(OPENSSL_LOBOTOMISED_AES) |
28 | # define USE_BUILTIN_RIJNDAEL | ||
29 | #endif | ||
30 | |||
31 | #ifdef USE_BUILTIN_RIJNDAEL | ||
28 | # define EVP_aes_128_cbc evp_rijndael | 32 | # define EVP_aes_128_cbc evp_rijndael |
29 | # define EVP_aes_192_cbc evp_rijndael | 33 | # define EVP_aes_192_cbc evp_rijndael |
30 | # define EVP_aes_256_cbc evp_rijndael | 34 | # define EVP_aes_256_cbc evp_rijndael |