diff options
| author | des <des@FreeBSD.org> | 2006-03-22 19:46:12 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-03-22 19:46:12 +0000 |
| commit | 448503722a8c8934d8520302b7551e95de730b06 (patch) | |
| tree | 42b3633dec62ddc0b702c6e83df5d64683b1c6c3 /crypto/openssh/openbsd-compat/openssl-compat.h | |
| parent | 755a16fa864cacbbd9fbefc822011b6741351d8d (diff) | |
| download | FreeBSD-src-448503722a8c8934d8520302b7551e95de730b06.zip FreeBSD-src-448503722a8c8934d8520302b7551e95de730b06.tar.gz | |
Vendor import of OpenSSH 4.3p1.
Diffstat (limited to 'crypto/openssh/openbsd-compat/openssl-compat.h')
| -rw-r--r-- | crypto/openssh/openbsd-compat/openssl-compat.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/crypto/openssh/openbsd-compat/openssl-compat.h b/crypto/openssh/openbsd-compat/openssl-compat.h index d9b2fa5..8a015ec 100644 --- a/crypto/openssh/openbsd-compat/openssl-compat.h +++ b/crypto/openssh/openbsd-compat/openssl-compat.h @@ -1,4 +1,4 @@ -/* $Id: openssl-compat.h,v 1.1 2005/06/09 11:45:11 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 @@ -43,7 +47,12 @@ extern const EVP_CIPHER *evp_acss(void); #endif /* - * insert comment here + * We overload some of the OpenSSL crypto functions with ssh_* equivalents + * which cater for older and/or less featureful OpenSSL version. + * + * In order for the compat library to call the real functions, it must + * define SSH_DONT_OVERLOAD_OPENSSL_FUNCS before including this file and + * implement the ssh_* equivalents. */ #ifdef SSH_OLD_EVP |
