diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2007-06-14 15:21:32 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2007-06-14 15:21:32 +0200 |
| commit | cb52017ad9024e4d72766a19f286addcdafc2374 (patch) | |
| tree | 739207c3be6c98d5efab88fbfdd93a403c1b568c /openbsd-compat | |
| parent | - dtucker@cvs.openbsd.org 2007/06/12 13:54:28 (diff) | |
| download | openssh-cb52017ad9024e4d72766a19f286addcdafc2374.tar.xz openssh-cb52017ad9024e4d72766a19f286addcdafc2374.zip | |
- (dtucker) [cipher-ctr.c umac.c openbsd-compat/openssl-compat.h] Move the
USE_BUILTIN_RIJNDAEL compat goop to openssl-compat.h so it can be
shared with umac.c. Allows building with OpenSSL 0.9.5 again including
umac support. With tim@ djm@, ok djm.
Diffstat (limited to 'openbsd-compat')
| -rw-r--r-- | openbsd-compat/openssl-compat.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index 9b5ccff5f..01efb9cfa 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h @@ -1,4 +1,4 @@ -/* $Id: openssl-compat.h,v 1.7 2007/03/05 07:25:20 dtucker Exp $ */ +/* $Id: openssl-compat.h,v 1.8 2007/06/14 13:21:33 dtucker Exp $ */ /* * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> @@ -22,6 +22,15 @@ #if OPENSSL_VERSION_NUMBER < 0x00906000L # define SSH_OLD_EVP # define EVP_CIPHER_CTX_get_app_data(e) ((e)->app_data) +# define USE_BUILTIN_RIJNDAEL +#endif + +#ifdef USE_BUILTIN_RIJNDAEL +# include "rijndael.h" +# define AES_KEY rijndael_ctx +# define AES_BLOCK_SIZE 16 +# define AES_encrypt(a, b, c) rijndael_encrypt(c, a, b) +# define AES_set_encrypt_key(a, b, c) rijndael_set_key(c, (char *)a, b, 1) #endif #if (OPENSSL_VERSION_NUMBER < 0x00907000L) || defined(OPENSSL_LOBOTOMISED_AES) |