contrib/pgcrypto patch for OpenSSL 0.9.8

Started by Michael Fuhrabout 21 years ago10 messagespatches
Jump to latest
#1Michael Fuhr
mike@fuhr.org

This patch allows contrib/pgcrypto to build with OpenSSL 0.9.8
(currently in beta) when cryptolib = openssl. According to the
following checkin message from several years ago, OpenSSL application
developers should no longer rely on <openssl/evp.h> to include
everything they need:

http://cvs.openssl.org/chngview?cn=9888

This patch adds the necessary header files. It doesn't appear to
break anything when building against OpenSSL 0.9.7.

BTW, core appears to build and work fine with OpenSSL 0.9.8. I've
built 7.3 through HEAD against 0.9.8-beta6 without noticing any
problems.

--
Michael Fuhr
http://www.fuhr.org/~mfuhr/

Attachments:

pgcrypto.patchtext/plain; charset=us-asciiDownload+3-0
#2Bruce Momjian
bruce@momjian.us
In reply to: Michael Fuhr (#1)
Re: contrib/pgcrypto patch for OpenSSL 0.9.8

Patch applied. Thanks.

---------------------------------------------------------------------------

Michael Fuhr wrote:

This patch allows contrib/pgcrypto to build with OpenSSL 0.9.8
(currently in beta) when cryptolib = openssl. According to the
following checkin message from several years ago, OpenSSL application
developers should no longer rely on <openssl/evp.h> to include
everything they need:

http://cvs.openssl.org/chngview?cn=9888

This patch adds the necessary header files. It doesn't appear to
break anything when building against OpenSSL 0.9.7.

BTW, core appears to build and work fine with OpenSSL 0.9.8. I've
built 7.3 through HEAD against 0.9.8-beta6 without noticing any
problems.

--
Michael Fuhr
http://www.fuhr.org/~mfuhr/

[ Attachment, skipping... ]

---------------------------(end of broadcast)---------------------------
TIP 3: if posting/reading through Usenet, please send an appropriate
subscribe-nomail command to majordomo@postgresql.org so that your
message can get through to the mailing list cleanly

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073
#3Marko Kreen
markokr@gmail.com
In reply to: Bruce Momjian (#2)
Re: contrib/pgcrypto patch for OpenSSL 0.9.8

On Sat, Jul 02, 2005 at 10:33:05PM -0400, Bruce Momjian wrote:

Patch applied. Thanks.
---------------------------------------------------------------------------
Michael Fuhr wrote:

This patch allows contrib/pgcrypto to build with OpenSSL 0.9.8
(currently in beta) when cryptolib = openssl. According to the
following checkin message from several years ago, OpenSSL application
developers should no longer rely on <openssl/evp.h> to include
everything they need:

http://cvs.openssl.org/chngview?cn=9888

This patch adds the necessary header files. It doesn't appear to
break anything when building against OpenSSL 0.9.7.

BTW, core appears to build and work fine with OpenSSL 0.9.8. I've
built 7.3 through HEAD against 0.9.8-beta6 without noticing any
problems.

Thanks for the patch.

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

Attachments:

openssl-aes-fix.difftext/plain; charset=us-asciiDownload+3-2
#4Bruce Momjian
bruce@momjian.us
In reply to: Marko Kreen (#3)
Re: contrib/pgcrypto patch for OpenSSL 0.9.8

Patch applied. Thanks.

---------------------------------------------------------------------------

Marko Kreen wrote:

On Sat, Jul 02, 2005 at 10:33:05PM -0400, Bruce Momjian wrote:

Patch applied. Thanks.
---------------------------------------------------------------------------
Michael Fuhr wrote:

This patch allows contrib/pgcrypto to build with OpenSSL 0.9.8
(currently in beta) when cryptolib = openssl. According to the
following checkin message from several years ago, OpenSSL application
developers should no longer rely on <openssl/evp.h> to include
everything they need:

http://cvs.openssl.org/chngview?cn=9888

This patch adds the necessary header files. It doesn't appear to
break anything when building against OpenSSL 0.9.7.

BTW, core appears to build and work fine with OpenSSL 0.9.8. I've
built 7.3 through HEAD against 0.9.8-beta6 without noticing any
problems.

Thanks for the patch.

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

[ Attachment, skipping... ]

---------------------------(end of broadcast)---------------------------
TIP 1: subscribe and unsubscribe commands go to majordomo@postgresql.org

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073
#5Neil Conway
neilc@samurai.com
In reply to: Bruce Momjian (#4)
Re: contrib/pgcrypto patch for OpenSSL 0.9.8

Bruce Momjian wrote:

Patch applied. Thanks.

Should either or both of these patches be applied to back branches?

-Neil

#6Michael Fuhr
mike@fuhr.org
In reply to: Neil Conway (#5)
Re: contrib/pgcrypto patch for OpenSSL 0.9.8

On Mon, Jul 04, 2005 at 12:22:03PM +1000, Neil Conway wrote:

Should either or both of these patches be applied to back branches?

Considering that OpenSSL 0.9.8 is supposed to be final "very soon"[1]http://www.mail-archive.com/openssl-announce@openssl.org/msg00062.html,
probably much sooner than PostgreSQL 8.1, some people will probably
install it and have pgcrypto build problems. Any chance of applying
the patches to at least REL8_0_STABLE?

[1]: http://www.mail-archive.com/openssl-announce@openssl.org/msg00062.html

--
Michael Fuhr
http://www.fuhr.org/~mfuhr/

#7Marko Kreen
markokr@gmail.com
In reply to: Neil Conway (#5)
Re: contrib/pgcrypto patch for OpenSSL 0.9.8

On Mon, Jul 04, 2005 at 12:22:03PM +1000, Neil Conway wrote:

Bruce Momjian wrote:

Patch applied. Thanks.

Should either or both of these patches be applied to back branches?

That would be a good idea.

--
marko

#8Bruce Momjian
bruce@momjian.us
In reply to: Marko Kreen (#7)
Re: contrib/pgcrypto patch for OpenSSL 0.9.8

Marko Kreen wrote:

On Mon, Jul 04, 2005 at 12:22:03PM +1000, Neil Conway wrote:

Bruce Momjian wrote:

Patch applied. Thanks.

Should either or both of these patches be applied to back branches?

That would be a good idea.

OK, I have applied the last two diffs for pgcrypto includes to 8.0.X,
attached.

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073

Attachments:

/bjm/difftext/plainDownload+14-0
#9Marko Kreen
markokr@gmail.com
In reply to: Bruce Momjian (#8)
Re: contrib/pgcrypto patch for OpenSSL 0.9.8

On Mon, Jul 04, 2005 at 10:31:21AM -0400, Bruce Momjian wrote:

OK, I have applied the last two diffs for pgcrypto includes to 8.0.X,
attached.

*** contrib/pgcrypto/openssl.c	12 Mar 2005 06:54:31 -0000	1.13.4.1
--- contrib/pgcrypto/openssl.c	4 Jul 2005 14:30:12 -0000
***************
*** 35,40 ****
--- 35,54 ----

#include <openssl/evp.h>

+ #include <openssl/evp.h>

Why second time?

--
marko

#10Bruce Momjian
bruce@momjian.us
In reply to: Marko Kreen (#9)
Re: contrib/pgcrypto patch for OpenSSL 0.9.8

Marko Kreen wrote:

On Mon, Jul 04, 2005 at 10:31:21AM -0400, Bruce Momjian wrote:

OK, I have applied the last two diffs for pgcrypto includes to 8.0.X,
attached.

*** contrib/pgcrypto/openssl.c	12 Mar 2005 06:54:31 -0000	1.13.4.1
--- contrib/pgcrypto/openssl.c	4 Jul 2005 14:30:12 -0000
***************
*** 35,40 ****
--- 35,54 ----

#include <openssl/evp.h>

+ #include <openssl/evp.h>

Why second time?

Oh, I see, yea, got duplicated. That is fixed in the committed version.

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073