database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-05 09:19:17 +03:00
Code

Fix bugs in OpenSSL hook renaming.

Browse Source 
libpq's exports.txt was overlooked in commit 36d108761, which the
buildfarm is quite unhappy about.

Also, I'd gathered that the plan included renaming PQgetSSLKeyPassHook
to PQgetSSLKeyPassHook_OpenSSL, but that didn't happen in the patch
as committed.  I'm taking it on my own authority to do so now, since
the window before beta1 is closing fast.
This commit is contained in:
Tom Lane 2020-05-16 19:44:49 -04:00
parent 36d1087611
commit e78b930945
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/src/sgml/libpq.sgml
View File

@ -776,7 +776,7 @@ PGPing PQping(const char *conninfo);
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry id="libpq-pqsetsslkeypasshook"> <varlistentry id="libpq-pqsetsslkeypasshook-openssl">
<term><function>PQsetSSLKeyPassHook_OpenSSL</function><indexterm><primary>PQsetSSLKeyPassHook_OpenSSL</primary></indexterm></term> <term><function>PQsetSSLKeyPassHook_OpenSSL</function><indexterm><primary>PQsetSSLKeyPassHook_OpenSSL</primary></indexterm></term>
<listitem> <listitem>
<para> <para>
@ -826,16 +826,16 @@ int callback_fn(char *buf, int size, PGconn *conn);
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry id="libpq-pqgetsslkeypasshook"> <varlistentry id="libpq-pqgetsslkeypasshook-openssl">
<term><function>PQgetSSLKeyPassHook</function><indexterm><primary>PQgetSSLKeyPassHook</primary></indexterm></term> <term><function>PQgetSSLKeyPassHook_OpenSSL</function><indexterm><primary>PQgetSSLKeyPassHook_OpenSSL</primary></indexterm></term>
<listitem> <listitem>
<para> <para>
<function>PQgetSSLKeyPassHook</function> returns the current <function>PQgetSSLKeyPassHook_OpenSSL</function> returns the current
client certificate key password hook, or <literal>NULL</literal> client certificate key password hook, or <literal>NULL</literal>
if none has been set. if none has been set.
<synopsis> <synopsis>
PQsslKeyPassHook_OpenSSL_type PQgetSSLKeyPassHook(void); PQsslKeyPassHook_OpenSSL_type PQgetSSLKeyPassHook_OpenSSL(void);
</synopsis> </synopsis>
</para> </para>
@ -7670,7 +7670,8 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
OpenSSL with a <literal>Enter PEM pass phrase:</literal> OpenSSL with a <literal>Enter PEM pass phrase:</literal>
prompt if a TTY is available. Applications can override the client certificate prompt if a TTY is available. Applications can override the client certificate
prompt and the handling of the <literal>sslpassword</literal> parameter by supplying prompt and the handling of the <literal>sslpassword</literal> parameter by supplying
their own key password callback; see <xref linkend="libpq-pqsetsslkeypasshook"/>. their own key password callback; see
<xref linkend="libpq-pqsetsslkeypasshook-openssl"/>.
</para> </para>
<para> <para>

6
src/interfaces/libpq/exports.txt
View File

@ -176,6 +176,6 @@ PQresultMemorySize 173
PQhostaddr 174 PQhostaddr 174
PQgssEncInUse 175 PQgssEncInUse 175
PQgetgssctx 176 PQgetgssctx 176
PQsetSSLKeyPassHook 177 PQsetSSLKeyPassHook_OpenSSL 177
PQgetSSLKeyPassHook 178 PQgetSSLKeyPassHook_OpenSSL 178
PQdefaultSSLKeyPassHook 179 PQdefaultSSLKeyPassHook_OpenSSL 179

2
src/interfaces/libpq/fe-secure-openssl.c
View File

@ -1687,7 +1687,7 @@ PQdefaultSSLKeyPassHook_OpenSSL(char *buf, int size, PGconn *conn)
} }
PQsslKeyPassHook_OpenSSL_type PQsslKeyPassHook_OpenSSL_type
PQgetSSLKeyPassHook(void) PQgetSSLKeyPassHook_OpenSSL(void)
{ {
return PQsslKeyPassHook; return PQsslKeyPassHook;
} }

2
src/interfaces/libpq/libpq-fe.h
View File

@ -621,7 +621,7 @@ extern int pg_valid_server_encoding_id(int encoding);
/* Support for overriding sslpassword handling with a callback. */ /* Support for overriding sslpassword handling with a callback. */
typedef int (*PQsslKeyPassHook_OpenSSL_type) (char *buf, int size, PGconn *conn); typedef int (*PQsslKeyPassHook_OpenSSL_type) (char *buf, int size, PGconn *conn);
extern PQsslKeyPassHook_OpenSSL_type PQgetSSLKeyPassHook(void); extern PQsslKeyPassHook_OpenSSL_type PQgetSSLKeyPassHook_OpenSSL(void);
extern void PQsetSSLKeyPassHook_OpenSSL(PQsslKeyPassHook_OpenSSL_type hook); extern void PQsetSSLKeyPassHook_OpenSSL(PQsslKeyPassHook_OpenSSL_type hook);
extern int PQdefaultSSLKeyPassHook_OpenSSL(char *buf, int size, PGconn *conn); extern int PQdefaultSSLKeyPassHook_OpenSSL(char *buf, int size, PGconn *conn);