- (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.

diff --git a/ChangeLog b/ChangeLog
index e5c8cc6a4c3b03e367272cd7ccab0f70006524b8..5133a77471306402dc32146cc2ec7b41f598ca67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index 602266d67510c78577d3f48a0235c2043ef252fd..e44f501f5f1f7039d56a39d8db06dc1b99ddab70 100644 (file)
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -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)