diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2007-06-14 23:47:31 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2007-06-14 23:47:31 +1000 |
| commit | 7dae3d296e685843f003038a7f1a9f8ef7f614bd (patch) | |
| tree | 4cb5744776856969616c5aec6a72e2366032162c | |
| parent | a2ed75582fb10a67424bca64775d0121631760fb (diff) | |
- (dtucker) [openbsd-compat/openssl-compat.h] Remove redundant definition
of USE_BUILTIN_RIJNDAEL since the <0.9.6 test is covered by the
subsequent <0.9.7 test.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | openbsd-compat/openssl-compat.h | 3 |
2 files changed, 5 insertions, 3 deletions
@@ -5,6 +5,9 @@ umac support. With tim@ djm@, ok djm. - (dtucker) [openbsd-compat/openssl-compat.h] Merge USE_BUILTIN_RIJNDAEL sections. Fixes builds with early OpenSSL 0.9.6 versions. + - (dtucker) [openbsd-compat/openssl-compat.h] Remove redundant definition + of USE_BUILTIN_RIJNDAEL since the <0.9.6 test is covered by the + subsequent <0.9.7 test. 20070612 - (dtucker) OpenBSD CVS Sync @@ -3069,4 +3072,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4701 2007/06/14 13:38:39 dtucker Exp $ +$Id: ChangeLog,v 1.4702 2007/06/14 13:47:31 dtucker Exp $ diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index cd7e366a..f1d2f19f 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h @@ -1,4 +1,4 @@ -/* $Id: openssl-compat.h,v 1.9 2007/06/14 13:38:39 dtucker Exp $ */ +/* $Id: openssl-compat.h,v 1.10 2007/06/14 13:47:31 dtucker Exp $ */ /* * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> @@ -22,7 +22,6 @@ #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 #if (OPENSSL_VERSION_NUMBER < 0x00907000L) || defined(OPENSSL_LOBOTOMISED_AES) |