Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a3ff1aa

Browse files
committed
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
1 parent bee9aef commit a3ff1aa

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

contrib/pgcrypto/openssl.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
2727
* SUCH DAMAGE.
2828
*
29-
* $PostgreSQL: pgsql/contrib/pgcrypto/openssl.c,v 1.18 2005/07/03 02:32:56 momjian Exp $
29+
* $PostgreSQL: pgsql/contrib/pgcrypto/openssl.c,v 1.19 2005/07/04 02:02:01 momjian Exp $
3030
*/
3131

3232
#include <postgres.h>
@@ -39,11 +39,12 @@
3939
#include <openssl/des.h>
4040

4141
/*
42-
* Is OpenSSL compiled with AES?
42+
* Does OpenSSL support AES?
4343
*/
4444
#undef GOT_AES
45-
#ifdef AES_ENCRYPT
45+
#if OPENSSL_VERSION_NUMBER >= 0x00907000L
4646
#define GOT_AES
47+
#include <openssl/aes.h>
4748
#endif
4849

4950
/*

0 commit comments

Comments
 (0)