Commit a3ff1aad authored by Bruce Momjian's avatar Bruce Momjian

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
parent bee9aef4
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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> #include <postgres.h>
...@@ -39,11 +39,12 @@ ...@@ -39,11 +39,12 @@
#include <openssl/des.h> #include <openssl/des.h>
/* /*
* Is OpenSSL compiled with AES? * Does OpenSSL support AES?
*/ */
#undef GOT_AES #undef GOT_AES
#ifdef AES_ENCRYPT #if OPENSSL_VERSION_NUMBER >= 0x00907000L
#define GOT_AES #define GOT_AES
#include <openssl/aes.h>
#endif #endif
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment