On Sat, Jul 02, 2005 at 10:33:05PM -0400, Bruce Momjian wrote: > Patch applied. Thanks. > --------------------------------------------------------------------------- > Michael Fuhr wrote: > > This patch allows contrib/pgcrypto to build with OpenSSL 0.9.8 > > (currently in beta) when cryptolib = openssl. According to the > > following checkin message from several years ago, OpenSSL application > > developers should no longer rely on <openssl/evp.h> to include > > everything they need: > > > > http://cvs.openssl.org/chngview?cn=9888 > > > > This patch adds the necessary header files. It doesn't appear to > > break anything when building against OpenSSL 0.9.7. > > > > BTW, core appears to build and work fine with OpenSSL 0.9.8. I've > > built 7.3 through HEAD against 0.9.8-beta6 without noticing any > > problems.
Thanks for the patch. 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
Index: contrib/pgcrypto/openssl.c =================================================================== RCS file: /projects/cvsroot/pgsql/contrib/pgcrypto/openssl.c,v retrieving revision 1.18 diff -p -u -r1.18 openssl.c --- contrib/pgcrypto/openssl.c 3 Jul 2005 02:32:56 -0000 1.18 +++ contrib/pgcrypto/openssl.c 3 Jul 2005 05:17:29 -0000 @@ -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 /*
---------------------------(end of broadcast)--------------------------- TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]
