diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-07-04 14:42:39 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-07-04 14:42:39 +0000 |
| commit | 75aed9f0c262bd930de01fed29381e281b35588c (patch) | |
| tree | ad737e534207e8ea871367a5dc4a6c656164ad76 | |
| parent | 0a056c3716065b044c5b0ab4e724b6f7d3c5721b (diff) | |
| download | postgresql-75aed9f0c262bd930de01fed29381e281b35588c.tar.gz postgresql-75aed9f0c262bd930de01fed29381e281b35588c.zip | |
Backpatch to 8.0.X openssl portability fixes to pgcrypto.
| -rw-r--r-- | contrib/pgcrypto/openssl.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c index 71a18dfddac..501b75d341d 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.13.4.1 2005/03/12 06:54:31 neilc Exp $ + * $PostgreSQL: pgsql/contrib/pgcrypto/openssl.c,v 1.13.4.2 2005/07/04 14:42:39 momjian Exp $ */ #include <postgres.h> @@ -34,8 +34,20 @@ #include "px.h" #include <openssl/evp.h> +#include <openssl/blowfish.h> +#include <openssl/cast.h> +#include <openssl/des.h> /* + * Does OpenSSL support AES? + */ +#undef GOT_AES +#if OPENSSL_VERSION_NUMBER >= 0x00907000L +#define GOT_AES +#include <openssl/aes.h> +#endif + +/* * Hashes */ static unsigned |