diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | openbsd-compat/openssl-compat.h | 13 |
2 files changed, 8 insertions, 9 deletions
@@ -3,6 +3,8 @@ | |||
3 | USE_BUILTIN_RIJNDAEL compat goop to openssl-compat.h so it can be | 3 | USE_BUILTIN_RIJNDAEL compat goop to openssl-compat.h so it can be |
4 | shared with umac.c. Allows building with OpenSSL 0.9.5 again including | 4 | shared with umac.c. Allows building with OpenSSL 0.9.5 again including |
5 | umac support. With tim@ djm@, ok djm. | 5 | umac support. With tim@ djm@, ok djm. |
6 | - (dtucker) [openbsd-compat/openssl-compat.h] Merge USE_BUILTIN_RIJNDAEL | ||
7 | sections. Fixes builds with early OpenSSL 0.9.6 versions. | ||
6 | 8 | ||
7 | 20070612 | 9 | 20070612 |
8 | - (dtucker) OpenBSD CVS Sync | 10 | - (dtucker) OpenBSD CVS Sync |
@@ -3067,4 +3069,4 @@ | |||
3067 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3069 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3068 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3070 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3069 | 3071 | ||
3070 | $Id: ChangeLog,v 1.4700 2007/06/14 13:21:32 dtucker Exp $ | 3072 | $Id: ChangeLog,v 1.4701 2007/06/14 13:38:39 dtucker Exp $ |
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index 01efb9cfa..cd7e366ad 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openssl-compat.h,v 1.8 2007/06/14 13:21:33 dtucker Exp $ */ | 1 | /* $Id: openssl-compat.h,v 1.9 2007/06/14 13:38:39 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> |
@@ -25,19 +25,16 @@ | |||
25 | # define USE_BUILTIN_RIJNDAEL | 25 | # define USE_BUILTIN_RIJNDAEL |
26 | #endif | 26 | #endif |
27 | 27 | ||
28 | #if (OPENSSL_VERSION_NUMBER < 0x00907000L) || defined(OPENSSL_LOBOTOMISED_AES) | ||
29 | # define USE_BUILTIN_RIJNDAEL | ||
30 | #endif | ||
31 | |||
28 | #ifdef USE_BUILTIN_RIJNDAEL | 32 | #ifdef USE_BUILTIN_RIJNDAEL |
29 | # include "rijndael.h" | 33 | # include "rijndael.h" |
30 | # define AES_KEY rijndael_ctx | 34 | # define AES_KEY rijndael_ctx |
31 | # define AES_BLOCK_SIZE 16 | 35 | # define AES_BLOCK_SIZE 16 |
32 | # define AES_encrypt(a, b, c) rijndael_encrypt(c, a, b) | 36 | # define AES_encrypt(a, b, c) rijndael_encrypt(c, a, b) |
33 | # define AES_set_encrypt_key(a, b, c) rijndael_set_key(c, (char *)a, b, 1) | 37 | # define AES_set_encrypt_key(a, b, c) rijndael_set_key(c, (char *)a, b, 1) |
34 | #endif | ||
35 | |||
36 | #if (OPENSSL_VERSION_NUMBER < 0x00907000L) || defined(OPENSSL_LOBOTOMISED_AES) | ||
37 | # define USE_BUILTIN_RIJNDAEL | ||
38 | #endif | ||
39 | |||
40 | #ifdef USE_BUILTIN_RIJNDAEL | ||
41 | # define EVP_aes_128_cbc evp_rijndael | 38 | # define EVP_aes_128_cbc evp_rijndael |
42 | # define EVP_aes_192_cbc evp_rijndael | 39 | # define EVP_aes_192_cbc evp_rijndael |
43 | # define EVP_aes_256_cbc evp_rijndael | 40 | # define EVP_aes_256_cbc evp_rijndael |