diff options
Diffstat (limited to 'doc/src')
-rw-r--r-- | doc/src/sgml/installation.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/libpq.sgml | 36 |
2 files changed, 17 insertions, 21 deletions
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml index 9e5a35ca3fe..ff9abd4649d 100644 --- a/doc/src/sgml/installation.sgml +++ b/doc/src/sgml/installation.sgml @@ -293,7 +293,7 @@ encrypted client connections. <productname>OpenSSL</productname> is also required for random number generation on platforms that do not have <filename>/dev/urandom</filename> (except Windows). The minimum - required version is 1.0.2. + required version is 1.1.0. </para> </listitem> diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index f916fce4142..25646f6f8e0 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -9865,9 +9865,11 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*) <title>SSL Library Initialization</title> <para> - If your application initializes <literal>libssl</literal> and/or - <literal>libcrypto</literal> libraries and <application>libpq</application> - is built with <acronym>SSL</acronym> support, you should call + Applications which need to be compatible with older versions of + <productname>PostgreSQL</productname>, using <productname>OpenSSL</productname> + version 1.0.2 or older, need to initialize the SSL library before using it. + Applications which initialize <literal>libssl</literal> and/or + <literal>libcrypto</literal> libraries should call <xref linkend="libpq-PQinitOpenSSL"/> to tell <application>libpq</application> that the <literal>libssl</literal> and/or <literal>libcrypto</literal> libraries have been initialized by your application, so that @@ -9875,6 +9877,10 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*) However, this is unnecessary when using <productname>OpenSSL</productname> version 1.1.0 or later, as duplicate initializations are no longer problematic. </para> + <para> + Refer to the documentation for the version of <productname>PostgreSQL</productname> + that you are targeting for details on their use. + </para> <para> <variablelist> @@ -9890,21 +9896,8 @@ void PQinitOpenSSL(int do_ssl, int do_crypto); </para> <para> - When <parameter>do_ssl</parameter> is non-zero, <application>libpq</application> - will initialize the <productname>OpenSSL</productname> library before first - opening a database connection. When <parameter>do_crypto</parameter> is - non-zero, the <literal>libcrypto</literal> library will be initialized. By - default (if <xref linkend="libpq-PQinitOpenSSL"/> is not called), both libraries - are initialized. When SSL support is not compiled in, this function is - present but does nothing. - </para> - - <para> - If your application uses and initializes either <productname>OpenSSL</productname> - or its underlying <literal>libcrypto</literal> library, you <emphasis>must</emphasis> - call this function with zeroes for the appropriate parameter(s) - before first opening a database connection. Also be sure that you - have done that initialization before opening a database connection. + This function is deprecated and only present for backwards compatibility, + it does nothing. </para> </listitem> </varlistentry> @@ -9921,11 +9914,14 @@ void PQinitSSL(int do_ssl); <para> This function is equivalent to <literal>PQinitOpenSSL(do_ssl, do_ssl)</literal>. - It is sufficient for applications that initialize both or neither - of <productname>OpenSSL</productname> and <literal>libcrypto</literal>. + This function is deprecated and only present for backwards compatibility, + it does nothing. </para> <para> + <xref linkend="libpq-PQinitSSL"/> and <xref linkend="libpq-PQinitOpenSSL"/> + are maintained for backwards compatibility, but are no longer required + since <productname>PostgreSQL</productname> 18. <xref linkend="libpq-PQinitSSL"/> has been present since <productname>PostgreSQL</productname> 8.0, while <xref linkend="libpq-PQinitOpenSSL"/> was added in <productname>PostgreSQL</productname> 8.4, so <xref linkend="libpq-PQinitSSL"/> |