diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-07-04 02:02:01 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-07-04 02:02:01 +0000 |
| commit | a3ff1aad5dd6b55d8f84a32b57593677e77f503a (patch) | |
| tree | cd3019ba82eabcb0d3603a696f7e31174982ef00 | |
| parent | bee9aef43bff5a913aad4a42db9b15c7a9108d55 (diff) | |
| download | postgresql-a3ff1aad5dd6b55d8f84a32b57593677e77f503a.tar.gz postgresql-a3ff1aad5dd6b55d8f84a32b57593677e77f503a.zip | |
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
| -rw-r--r-- | contrib/pgcrypto/openssl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c index 86f29e4dc89..8a21194f8c2 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 /* |