pgsql: Only provide new libpq sslpasskey hook for openssl-enabled build

Started by Andrew Dunstanabout 6 years ago4 messagescomitters
Jump to latest
#1Andrew Dunstan
andrew@dunslane.net

Only provide new libpq sslpasskey hook for openssl-enabled builds

In commit 4dc6355210 I neglected to put #ifdef USE_OPENSSL around the
declarations of the new items. This is remedied here.

Per complaint from Daniel Gustafsson.

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/9e24109f1a4e4d8d1d372b004d6a0dd06e673fe7

Modified Files
--------------
src/interfaces/libpq/libpq-fe.h | 2 ++
1 file changed, 2 insertions(+)

#2Daniel Gustafsson
daniel@yesql.se
In reply to: Andrew Dunstan (#1)
Re: pgsql: Only provide new libpq sslpasskey hook for openssl-enabled build

On 17 Apr 2020, at 20:19, Andrew Dunstan <andrew@dunslane.net> wrote:

Only provide new libpq sslpasskey hook for openssl-enabled builds

In commit 4dc6355210 I neglected to put #ifdef USE_OPENSSL around the
declarations of the new items. This is remedied here.

This wasn't really the problem I reported though. As per my patch [0]E1BB5261-5C89-494A-841B-283DAD27A2EA@yesql.se in the
email, the issue is with openssl_tls_init_hook in src/include/libpq/libpq-be.h
requiring an OpenSSL specific SSL_CTX parameter, thus breaking compilation for
other TLS backends. The name also makes it somewhat backend specific =)

PQgetSSLKeyPassHook is written generic enough that it could make sense for
other backends too, but for now I think we can keep the guards introduced in
this commit.

cheers ./daniel

[0]: E1BB5261-5C89-494A-841B-283DAD27A2EA@yesql.se

#3Andrew Dunstan
andrew@dunslane.net
In reply to: Daniel Gustafsson (#2)
Re: pgsql: Only provide new libpq sslpasskey hook for openssl-enabled build

On 4/17/20 3:27 PM, Daniel Gustafsson wrote:

On 17 Apr 2020, at 20:19, Andrew Dunstan <andrew@dunslane.net> wrote:

Only provide new libpq sslpasskey hook for openssl-enabled builds

In commit 4dc6355210 I neglected to put #ifdef USE_OPENSSL around the
declarations of the new items. This is remedied here.

This wasn't really the problem I reported though. As per my patch [0] in the
email, the issue is with openssl_tls_init_hook in src/include/libpq/libpq-be.h
requiring an OpenSSL specific SSL_CTX parameter, thus breaking compilation for
other TLS backends. The name also makes it somewhat backend specific =)

PQgetSSLKeyPassHook is written generic enough that it could make sense for
other backends too, but for now I think we can keep the guards introduced in
this commit.

cheers ./daniel

Oh, *sigh* brainfade.

Will fix.

cheers

andrew

--
Andrew Dunstan https://www.2ndQuadrant.com
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services

#4Daniel Gustafsson
daniel@yesql.se
In reply to: Andrew Dunstan (#3)
Re: pgsql: Only provide new libpq sslpasskey hook for openssl-enabled build

On 17 Apr 2020, at 21:46, Andrew Dunstan <andrew.dunstan@2ndquadrant.com> wrote:

On 4/17/20 3:27 PM, Daniel Gustafsson wrote:

On 17 Apr 2020, at 20:19, Andrew Dunstan <andrew@dunslane.net> wrote:

Only provide new libpq sslpasskey hook for openssl-enabled builds

In commit 4dc6355210 I neglected to put #ifdef USE_OPENSSL around the
declarations of the new items. This is remedied here.

This wasn't really the problem I reported though. As per my patch [0] in the
email, the issue is with openssl_tls_init_hook in src/include/libpq/libpq-be.h
requiring an OpenSSL specific SSL_CTX parameter, thus breaking compilation for
other TLS backends. The name also makes it somewhat backend specific =)

PQgetSSLKeyPassHook is written generic enough that it could make sense for
other backends too, but for now I think we can keep the guards introduced in
this commit.

Oh, *sigh* brainfade.

Will fix.

Thanks, f342d7ad03e61a1cea0339cf0c5aea0d01c3b43e was more what I had in mind.

cheers ./daniel