From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 4 Jul 2005 02:02:01 +0000 (+0000)
Subject: Bruce, please apply this additional patch, that fixes the
X-Git-Tag: REL8_1_0BETA1~399
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3ff1aad5dd6b55d8f84a32b57593677e77f503a;p=postgresql

Bruce, please apply this additional patch, that fixes the
auto-detection of AES.

Now openssl.c just checks OpenSSL version.  Whoever compiles
newer OpenSSL without AES is on his own.

Marko Kreen
---

diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c
index 86f29e4dc8..8a21194f8c 100644
--- a/contrib/pgcrypto/openssl.c
+++ b/contrib/pgcrypto/openssl.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $PostgreSQL: pgsql/contrib/pgcrypto/openssl.c,v 1.18 2005/07/03 02:32:56 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/openssl.c,v 1.19 2005/07/04 02:02:01 momjian Exp $
  */
 
 #include <postgres.h>
@@ -39,11 +39,12 @@
 #include <openssl/des.h>
 
 /*
- * Is OpenSSL compiled with AES? 
+ * Does OpenSSL support AES? 
  */
 #undef GOT_AES
-#ifdef AES_ENCRYPT
+#if OPENSSL_VERSION_NUMBER >= 0x00907000L
 #define GOT_AES
+#include <openssl/aes.h>
 #endif
 
 /*