- (dtucker) [openbsd-compat/openssl-compat.h] Merge USE_BUILTIN_RIJNDAEL

   sections.  Fixes builds with early OpenSSL 0.9.6 versions.

2 files changed, 8 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index dda00d04d..c1cbfd1cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    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.
+ - (dtucker) [openbsd-compat/openssl-compat.h] Merge USE_BUILTIN_RIJNDAEL
+   sections.  Fixes builds with early OpenSSL 0.9.6 versions.
 
 20070612
  - (dtucker) OpenBSD CVS Sync
@@ -3067,4 +3069,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.4700 2007/06/14 13:21:32 dtucker Exp $
+$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 @@
-/* $Id: openssl-compat.h,v 1.8 2007/06/14 13:21:33 dtucker Exp $ */
+/* $Id: openssl-compat.h,v 1.9 2007/06/14 13:38:39 dtucker Exp $ */
 
 /*
  * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@@ -25,19 +25,16 @@
 # define USE_BUILTIN_RIJNDAEL
 #endif
 
+#if (OPENSSL_VERSION_NUMBER < 0x00907000L) || defined(OPENSSL_LOBOTOMISED_AES)
+# 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)
-# 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