Commita3ff1aa

committed

Bruce, please apply this additional patch, that fixes the

auto-detection of AES.Now openssl.c just checks OpenSSL version. Whoever compilesnewer OpenSSL without AES is on his own.Marko Kreen

1 parentbee9aef commita3ff1aaCopy full SHA for a3ff1aa

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF`
`27`	`27`	`* SUCH DAMAGE.`
`28`	`28`	`*`
`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 $`
`30`	`30`	`*/`
`31`	`31`
`32`	`32`	`#include<postgres.h>`
`@@ -39,11 +39,12 @@`
`39`	`39`	`#include<openssl/des.h>`
`40`	`40`
`41`	`41`	`/*`
`42`		`- *Is OpenSSLcompiled with AES?`
	`42`	`+ *Does OpenSSLsupport AES?`
`43`	`43`	`*/`
`44`	`44`	`#undef GOT_AES`
`45`		`-#ifdefAES_ENCRYPT`
	`45`	`+#ifOPENSSL_VERSION_NUMBER >=0x00907000L`
`46`	`46`	`#defineGOT_AES`
	`47`	`+#include<openssl/aes.h>`
`47`	`48`	`#endif`
`48`	`49`
`49`	`50`	`/*`

Comments

(0)